Adds CI job staging-test-with-rebase-focal

This will run the Focal staging job in the CI.

.circleci/config.yml

@@ -336,6 +336,37 @@ jobs:
       - store_artifacts:
           path: ~/sd/junit
 
+  staging-test-with-rebase-focal:
+    machine:
+      enabled: true
+
+    working_directory: ~/sd
+    steps:
+      - checkout
+      - *rebaseontarget
+      - *installenchant
+
+      - run:
+          name: Run Staging tests on GCE
+          command: |
+            BRANCH_MATCH=$(devops/scripts/match-ci-branch.sh "^(i18n)")
+            if [[ $BRANCH_MATCH =~ ^found ]]; then echo "Skipping: ${BRANCH_MATCH}"; exit 0; fi
+            BASE_OS=focal make ci-go
+          no_output_timeout: 35m
+
+      - run:
+          name: Ensure environment torn down
+          # Always report true, since env should will destroyed already
+          # if all tests passed.
+          command: make ci-teardown || true
+          when: always
+
+      - store_test_results:
+          path: ~/sd/junit
+
+      - store_artifacts:
+          path: ~/sd/junit
+
   deb-tests:
     docker:
       - image: gcr.io/cloud-builders/docker
@@ -415,6 +446,13 @@ workflows:
                 - /i18n-.*/
           requires:
             - lint
+      - staging-test-with-rebase-focal:
+          filters:
+            branches:
+              ignore:
+                - /i18n-.*/
+          requires:
+            - lint
       - translation-tests:
           requires:
             - lint

devops/gce-nested/ci-go.sh

@@ -12,6 +12,7 @@ set -e
 set -u
 set -o pipefail
 
+export BASE_OS="${BASE_OS:-xenial}"
 
 ./devops/gce-nested/gce-start.sh
 ./devops/gce-nested/gce-runner.sh

devops/gce-nested/gce-runner.sh

@@ -4,6 +4,7 @@
 # for storage as artifacts on the build, so devs can review via web.
 set -e
 set -u
+BASE_OS="${BASE_OS:-xenial}"
 
 
 TOPLEVEL="$(git rev-parse --show-toplevel)"
@@ -51,9 +52,15 @@ function copy_securedrop_repo() {
 
 # Main logic
 copy_securedrop_repo
-ssh_gce "make build-debs-notest"
 
 # The test results should be collected regardless of pass/fail,
 # so register a trap to ensure the fetch always runs.
 trap fetch_junit_test_results EXIT
-ssh_gce "make staging"
+if [ "${BASE_OS:-'xenial'}" = "xenial" ]
+then
+	ssh_gce "make build-debs-notest"
+	ssh_gce "make staging"
+else
+	ssh_gce "make build-debs-notest-focal"
+	ssh_gce "make staging-focal"
+fi