mirror of
https://github.com/sourcegraph/sourcegraph.git
synced 2026-02-06 15:31:48 +00:00
ci: drop gcloud init from ci steps (#26492)
This commit is contained in:
parent
cd180a009f
commit
b8e4ae7aac
@ -17,8 +17,6 @@
|
||||
|
||||
set -e
|
||||
|
||||
yes | gcloud auth configure-docker
|
||||
|
||||
src="$1"
|
||||
|
||||
echo "--- pulling $src"
|
||||
|
||||
3
dev/ci/test/Vagrantfile
vendored
3
dev/ci/test/Vagrantfile
vendored
@ -38,7 +38,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||
srv.vm.provider :google do |g, o|
|
||||
g.service_account = ENV["VAGRANT_SERVICE_ACCOUNT"] || nil
|
||||
g.machine_type = server['machine_type']
|
||||
g.image = 'e2e-2e61d9153-2021-06-22t15-18-00z'
|
||||
g.image = 'e2e-a5705fc91-2021-10-21t15-43-16z'
|
||||
g.image_project_id = 'sourcegraph-ci'
|
||||
g.google_project_id = project_id
|
||||
g.name = "#{server['name']}-"+"#{Time.now.to_i}"
|
||||
@ -120,6 +120,7 @@ export VAGRANT_SERVICE_ACCOUNT=#{ENV['VAGRANT_SERVICE_ACCOUNT']}
|
||||
export MINIMUM_UPGRADEABLE_VERSION=#{ENV['MINIMUM_UPGRADEABLE_VERSION']}
|
||||
|
||||
EOF
|
||||
gcloud auth configure-docker --quiet
|
||||
SHELL
|
||||
|
||||
server['shell_commands'].each do |sh|
|
||||
|
||||
@ -9,9 +9,6 @@ set -ex
|
||||
# Use candidate image built by main pipeline
|
||||
export IMAGE="us.gcr.io/sourcegraph-dev/server:${CANDIDATE_VERSION}"
|
||||
|
||||
# us.gcr.io is a private registry, ensure we can pull
|
||||
yes | gcloud auth configure-docker
|
||||
|
||||
# TODO(JH) Remove that before merging the PR
|
||||
if [[ -n "$DUP_GITHUB_TOKEN" ]]; then
|
||||
GITHUB_TOKEN=$DUP_GITHUB_TOKEN
|
||||
|
||||
@ -5,7 +5,6 @@ set -euo pipefail
|
||||
asdf install
|
||||
yarn
|
||||
yarn generate
|
||||
echo yes | gcloud auth configure-docker
|
||||
|
||||
curl -L https://sourcegraph.com/.api/src-cli/src_linux_amd64 -o /usr/local/bin/src
|
||||
chmod +x /usr/local/bin/src
|
||||
|
||||
@ -504,7 +504,6 @@ func buildCandidateDockerImage(app, version, tag string) operations.Operation {
|
||||
bk.Env("DOCKER_BUILDKIT", "1"),
|
||||
bk.Env("IMAGE", localImage),
|
||||
bk.Env("VERSION", version),
|
||||
bk.Cmd("yes | gcloud auth configure-docker"),
|
||||
}
|
||||
|
||||
if _, err := os.Stat(filepath.Join("docker-images", app)); err == nil {
|
||||
|
||||
@ -3,7 +3,6 @@
|
||||
set -ex
|
||||
pushd "$(dirname "${BASH_SOURCE[0]}")/../../../.." >/dev/null
|
||||
|
||||
yes | gcloud auth configure-docker
|
||||
docker build \
|
||||
-f ./internal/cmd/search-blitz/Dockerfile \
|
||||
--build-arg COMMIT_SHA="$(git rev-parse HEAD)" \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user