Repository navigation
ci: Run the smoke test VM with gcloud and ssh instead of Vagrant - #1474
Closed
marcleblanc2 wants to merge 1 commit into
Closed
marcleblanc2 wants to merge 1 commit into
marcleblanc2 wants to merge 1 commit into
Conversation
Vagrant came in 2020 so one Vagrantfile could run the smoke test in a local VirtualBox VM or on GCE. Only the GCE provider is left, so Vagrant now only adds Ruby, the vagrant-google plugin, a pinned Vagrant on the agents, and an rsync of the repo. smoke-test-vm.sh replaces vagrant-run.sh, the Vagrantfile, and servers.yaml. It creates the VM with the same settings, authorizes a key made for the job, copies the repo over ssh, and runs the steps servers.yaml listed as root, sending the Docker Hub password over stdin. The boot disk grows from vagrant-google's default 10 GB to 20 GB, which the Ubuntu 26.04 e2e image will need for Docker 29's containerd image store. Co-authored-by: Amp <amp@ampcode.com> Amp-Thread-ID: https://ampcode.com/threads/T-01a1c770-8d7e-76ad-b47f-2a2ff80873cc
1 task done
Contributor
Author
|
Closing in favor of #1488, the same change cut smaller. The branch stays. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Drops Vagrant from the smoke test. Stacked on #1472 (and #1468 below it).
Why
Vagrant came in with #141 in 2020, so one Vagrantfile could run the smoke test in a local VirtualBox VM or on GCE. Only the GCE provider is left, so Vagrant now only adds Ruby, the
vagrant-googleplugin, Vagrant pinned to 2.4.1 on the agents for that plugin, and an rsync of the repo.What changes
.buildkite/smoke-test-vm.shreplacesvagrant-run.sh,test/Vagrantfile, andtest/servers.yaml. It creates the VM withgcloud compute instances createusing the same settings (image,custom-16-20480,us-central1-f, internal IP only,e2e-builderservice account and scopes), and keeps ci: Speed up the smoke test #1468's job-named VM, deletion, and stale VM sweep, and ci: Close the gaps in what CI checks #1472's per-job key filessh-keysinstance metadata. Nothing depends on the agent's~/.ssh/id_rsaor project-wide keys any moreservers.yamllisted run as root:smoke-test.sh, the jq install, andexecutor-smoke-test.sh. The Docker Hub password goes over stdin, so it is not in the VM's process list or the command linetype=vagrantbecomestype=smoke-test; nothing in the sourcegraph org filters on itTest plan
shellcheckandshfmtclean/deploy-sourcegraph-docker, jq installed,smoke-test.shfailed ondocker: command not found, the script copied a.logback and exited with 127, and the VM and disk were deletedsourcegraph-ci