what

.github/workflows/staging.yml

@@ -17,3 +17,7 @@ jobs:
       - name: Run staging tests on GCE
         run: |
           make ci-go
+      - name: Teardown (if needed)
+        if: always()
+        run: |
+          make ci-teardown || true

devops/gce-nested/ci-env.sh

@@ -4,16 +4,16 @@
 
 # If these scripts are run on developer workstations, the CI env
 # vars populated by CircleCI won't be present; make a sane default.
-if [ -z "${CIRCLE_BUILD_NUM:-}" ]; then
-    export CIRCLE_BUILD_NUM="${USER}"
+if [ -z "${GITHUB_RUN_ID:-}" ]; then
+    export GITHUB_RUN_ID="${USER}"
 fi
 
 # Set common vars we'll need throughout the CI scripts.
 TOPLEVEL="$(git rev-parse --show-toplevel)"
 export TOPLEVEL
 GCE_CREDS_FILE="${TOPLEVEL}/.gce.creds"
 export GCE_CREDS_FILE
-export BUILD_NUM="${CIRCLE_BUILD_NUM}"
+export BUILD_NUM="${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}"
 export PROJECT_ID="securedrop-ci"
 export JOB_NAME="sd-ci-nested"
 export GCLOUD_MACHINE_TYPE="c2-standard-8"

devops/gce-nested/gce-stop.sh

@@ -11,4 +11,4 @@ TOPLEVEL="$(git rev-parse --show-toplevel)"
 . "${TOPLEVEL}/devops/gce-nested/ci-env.sh"
 
 # Destroy remote instance
-gcloud_call --quiet compute instances delete "${JOB_NAME}-${BUILD_NUM}"
+gcloud_call compute instances delete "${JOB_NAME}-${BUILD_NUM}"