More YAML fixes

.gitlab/ci/test-helm3.gitlab-ci.yml

@@ -27,7 +27,7 @@
         }
 
 test-dependencies-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
   script:
@@ -35,7 +35,7 @@ test-dependencies-helm3:
     - kubectl version --client
 
 test-kube-domain-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     KUBE_INGRESS_BASE_DOMAIN: example.com
@@ -43,7 +43,7 @@ test-kube-domain-helm3:
     - auto-deploy check_kube_domain
 
 test-kube-domain-legacy-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     AUTO_DEVOPS_DOMAIN: example.com
@@ -51,21 +51,21 @@ test-kube-domain-legacy-helm3:
     - auto-deploy check_kube_domain && expected_error || failed_as_expected
 
 test-kube-domain_error-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
   script:
     - auto-deploy check_kube_domain && expected_error || failed_as_expected
 
 test-download-chart-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
   script:
     - auto-deploy download_chart
 
 test-deploy-name-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     CI_ENVIRONMENT_SLUG: production
@@ -84,7 +84,7 @@ test-deploy-name-helm3:
       fi
 
 test-auto_database_url-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     CI_ENVIRONMENT_SLUG: production
     POSTGRES_USER: user
@@ -123,7 +123,7 @@ test-auto_database_url-helm3:
     - auto-deploy auto_database_url && expected_error || failed_as_expected
 
 test-get-replicas-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     CI_ENVIRONMENT_SLUG: production
@@ -136,7 +136,7 @@ test-get-replicas-helm3:
       fi
 
 test-get-replicas-multiple-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     CI_ENVIRONMENT_SLUG: production
@@ -150,7 +150,7 @@ test-get-replicas-multiple-helm3:
       fi
 
 test-get-replicas-fraction-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     CI_ENVIRONMENT_SLUG: production
@@ -164,7 +164,7 @@ test-get-replicas-fraction-helm3:
       fi
 
 test-get-replicas-zero-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     CI_ENVIRONMENT_SLUG: production
@@ -178,7 +178,7 @@ test-get-replicas-zero-helm3:
       fi
 
 test-ensure-namespace-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     KUBE_NAMESPACE: project-123456
@@ -186,7 +186,7 @@ test-ensure-namespace-helm3:
     - auto-deploy ensure_namespace
 
 test-initialize-tiller-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     KUBE_NAMESPACE: default
@@ -194,7 +194,7 @@ test-initialize-tiller-helm3:
     - auto-deploy initialize_tiller | grep "Helm 3 does not have tiller"
 
 test-create-secret-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     KUBE_NAMESPACE: default
@@ -208,7 +208,7 @@ test-create-secret-helm3:
     - kubectl get secret "gitlab-registry-${CI_PROJECT_PATH_SLUG}" -n $KUBE_NAMESPACE
 
 test-create-secret-public-project-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     CI_PROJECT_VISIBILITY: public
@@ -218,7 +218,7 @@ test-create-secret-public-project-helm3:
     - kubectl get secret "gitlab-registry-${CI_PROJECT_PATH_SLUG}" -n $KUBE_NAMESPACE && expected_error || failed_as_expected
 
 test-persist-environment-url-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     CI_ENVIRONMENT_URL: review-app.example.com
@@ -227,7 +227,7 @@ test-persist-environment-url-helm3:
     - grep review-app.example.com environment_url.txt
 
 test-install-postgres-helm3:
-  <<: *test-job-helm3
+  extends: test-job-helm3
   variables:
     GIT_STRATEGY: none
     CI_ENVIRONMENT_SLUG: production
@@ -243,8 +243,8 @@ test-install-postgres-helm3:
     - kubectl get statefulset production-postgresql -n $KUBE_NAMESPACE
 
 test-deploy-helm3:
-  <<: *test-job-helm3
-  variables: &deploy-variables
+  extends: test-job-helm3
+  variables: &deploy-variables-helm3
     CI_APPLICATION_REPOSITORY: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/auto-build-image-with-psql"
     CI_APPLICATION_TAG: "5d248f6fa69a"
     CI_ENVIRONMENT_SLUG: production
@@ -292,7 +292,7 @@ test-deploy-debug-helm3:
 test-deploy-postgresql-channel-1-helm3:
   extends: test-deploy-helm3
   variables:
-    <<: *deploy-variables
+    <<: *deploy-variables-helm3
     AUTO_DEVOPS_POSTGRES_CHANNEL: 1
   script:
     - auto-deploy initialize_tiller
@@ -367,7 +367,7 @@ test-deploy-canary-helm3:
 test-deploy-modsecurity-helm3:
   extends: test-deploy-helm3
   variables:
-    <<: *deploy-variables
+    <<: *deploy-variables-helm3
     AUTO_DEVOPS_MODSECURITY_SEC_RULE_ENGINE: "On"
   script:
     - auto-deploy initialize_tiller