#440: switch back to running on ubuntu runners - ready to merge

.gitlab-ci.yml

@@ -51,7 +51,7 @@ build_client_linux:
     retry: 2
     stage: build
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./rebuild_client.sh Linux
@@ -66,7 +66,7 @@ build_client_macos:
     retry: 2
     stage: build
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./rebuild_client.sh Darwin
@@ -81,7 +81,7 @@ build_yaml:
     retry: 2
     stage: build
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - (cd kubernetes && ./rebuild.sh)
@@ -95,7 +95,7 @@ build_yaml:
 .build_without_bazel:
     stage: build
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
@@ -111,7 +111,7 @@ build_operator:
     retry: 2
     stage: build
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         # push to the CI registry
@@ -129,7 +129,7 @@ build_provisioner:
     retry: 2
     stage: build
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         # push to the CI registry
@@ -147,7 +147,7 @@ build_server:
     retry: 2
     stage: build
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         # push to the CI registry
@@ -188,7 +188,7 @@ linux_smoke:
     retry: 2
     stage: smoke
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - timeout 5m ./scripts/smoke.sh
@@ -198,7 +198,7 @@ linux_smoke:
 dotmesh_unit_tests:
     stage: test
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - go test `go list ./... | egrep -v /tests`
@@ -208,7 +208,7 @@ dotmesh_unit_tests:
 versioner_unit_tests:
     stage: test
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - cd cmd/versioner && go test
@@ -222,7 +222,7 @@ linux_default_dot:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestDefaultDot
@@ -239,7 +239,7 @@ linux_single_node:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestSingleNode
@@ -256,7 +256,7 @@ linux_recover_from_unmounted_dot_on_master:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestRecoverFromUnmountedDotOnMaster
@@ -273,7 +273,7 @@ linux_two_nodes_same_cluster:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestTwoNodesSameCluster
@@ -291,7 +291,7 @@ linux_kubernetes_volumes:
         - build_yaml
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestKubernetesVolumes
@@ -310,7 +310,7 @@ linux_kubernetes_operator_dynamic_provisioning:
         - build_client_linux
         - build_server
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestKubernetesOperator/DynamicProvisioning
@@ -329,7 +329,7 @@ linux_kubernetes_operator_PVC:
         - build_client_linux
         - build_server
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestKubernetesOperator/PVC*
@@ -346,7 +346,7 @@ linux_deletion_simple:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestDeletionSimple
@@ -363,7 +363,7 @@ linux_deletion_complex:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestDeletionComplex
@@ -380,7 +380,7 @@ linux_backup_and_restore_two_single_node_clusters:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestBackupAndRestoreTwoSingleNodeClusters
@@ -397,7 +397,7 @@ linux_two_single_node_clusters:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestTwoSingleNodeClusters
@@ -414,7 +414,7 @@ linux_three_single_node_clusters:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestThreeSingleNodeClusters
@@ -431,7 +431,7 @@ linux_two_double_node_clusters:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestTwoDoubleNodeClusters
@@ -448,7 +448,7 @@ linux_s3:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestS3Remote
@@ -466,7 +466,7 @@ linux_s3:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - ./test.sh -run TestKubernetesTestTooling
@@ -482,7 +482,7 @@ linux_stress_lots_of_commits:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - DOTMESH_TEST_TIMEOUT=30m ./test.sh -run TestStressLotsOfCommits
@@ -499,7 +499,7 @@ linux_stress_handover:
     dependencies:
         - build_client_linux
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - DOTMESH_TEST_TIMEOUT=30m ./test.sh -run TestStressHandover
@@ -520,7 +520,7 @@ publish_images:
         - build_server
         - build_yaml
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         # push to quay.io, by re-tagging and pushing the images
@@ -533,7 +533,7 @@ publish_images:
 trigger_e2e_test:
     stage: deploy
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - echo - curl -X POST -F "token=$E2E_TRIGGER_TOKEN" -F "ref=master" -F "variables[DOTMESH_CI_COMMIT_SHA]=$CI_COMMIT_SHA" -F "variables[DOTMESH_CI_BUILD_REF_NAME]=$CI_BUILD_REF_NAME" https://gitlab.dotmesh.com/api/v4/projects/31/trigger/pipeline
@@ -552,7 +552,7 @@ deploy_unstable_build:
         - build_yaml
         - publish_images
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no releases@get.dotmesh.io mkdir -p /pool/releases/unstable/$CI_COMMIT_REF_NAME"
@@ -571,7 +571,7 @@ deploy_release_build:
         - build_yaml
         - publish_images
     tags:
-        - ubuntu-bionic
+        - ubuntu
         - fast
     script:
         - VERSION=`cd cmd/versioner; go run versioner.go`; echo VERSION=$VERSION