Revert "Merge branch '33601-use-ci-default-branch-take-2' into 'master'"

This reverts merge request !19454

Revert "Merge branch '33601-use-ci-default-branch-take-2' into 'master'"
This reverts merge request !19454
6a8c7379 · Hordur Freyr Yngvason · cc09e305 · 6a8c7379 · 6a8c7379 · 6a8c7379
Commit 6a8c7379 authored Nov 13, 2019 by Hordur Freyr Yngvason
27 changed files
--- a/lib/gitlab/ci/templates/Android-Fastlane.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Android-Fastlane.gitlab-ci.yml
@@ -113,10 +113,9 @@ promoteBeta:
 promoteProduction:
  extends: .promote_job
  stage: production
-  # We only allow production promotion on the default branch because
+  # We only allow production promotion on `master` because
  # it has its own production scoped secret variables
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
  script:
    - bundle exec fastlane promote_beta_to_production
--- a/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
@@ -10,8 +10,7 @@ docker-build-master:
    - docker build --pull -t "$CI_REGISTRY_IMAGE" .
    - docker push "$CI_REGISTRY_IMAGE"
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 docker-build:
  # Official docker image.
@@ -25,5 +24,4 @@ docker-build:
    - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
  except:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -24,8 +24,9 @@ review:
      - tags
    kubernetes: active
  except:
+    refs:
+      - master
    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
      - $REVIEW_DISABLED
 stop_review:
@@ -47,8 +48,9 @@ stop_review:
      - tags
    kubernetes: active
  except:
+    refs:
+      - master
    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
      - $REVIEW_DISABLED
 # Staging deploys are disabled by default since
@@ -71,9 +73,10 @@ staging:
    name: staging
    url: http://$CI_PROJECT_PATH_SLUG-staging.$KUBE_INGRESS_BASE_DOMAIN
  only:
+    refs:
+      - master
    kubernetes: active
    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
      - $STAGING_ENABLED
 # Canaries are disabled by default, but if you want them,
@@ -95,9 +98,10 @@ canary:
    url: http://$CI_PROJECT_PATH_SLUG.$KUBE_INGRESS_BASE_DOMAIN
  when: manual
  only:
+    refs:
+      - master
    kubernetes: active
    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
      - $CANARY_ENABLED
 .production: &production_template
@@ -122,9 +126,9 @@ canary:
 production:
  <<: *production_template
  only:
+    refs:
+      - master
    kubernetes: active
-    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
  except:
    variables:
      - $STAGING_ENABLED
@@ -137,9 +141,10 @@ production_manual:
  when: manual
  allow_failure: false
  only:
+    refs:
+      - master
    kubernetes: active
    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
      - $STAGING_ENABLED
      - $CANARY_ENABLED
  except:
@@ -147,7 +152,7 @@ production_manual:
      - $INCREMENTAL_ROLLOUT_ENABLED
      - $INCREMENTAL_ROLLOUT_MODE
-# This job implements incremental rollout for every push to the default branch.
+# This job implements incremental rollout on for every push to `master`.
 .rollout: &rollout_template
  extends: .auto-deploy
@@ -173,9 +178,10 @@ production_manual:
  when: manual
  # This selectors are backward compatible mode with $INCREMENTAL_ROLLOUT_ENABLED (before 11.4)
  only:
+    refs:
+      - master
    kubernetes: active
    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
      - $INCREMENTAL_ROLLOUT_MODE == "manual"
      - $INCREMENTAL_ROLLOUT_ENABLED
  except:
@@ -187,9 +193,10 @@ production_manual:
  when: delayed
  start_in: 5 minutes
  only:
+    refs:
+      - master
    kubernetes: active
    variables:
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
      - $INCREMENTAL_ROLLOUT_MODE == "timed"
 timed rollout 10%:

--- a/lib/gitlab/ci/templates/Julia.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Julia.gitlab-ci.yml
@@ -64,8 +64,7 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 # WARNING: This template is using the `julia` images from [Docker
 # Hub][3]. One can use custom Julia images and/or the official ones found

--- a/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Maven.gitlab-ci.yml
@@ -6,7 +6,7 @@
 # This template will build and test your projects
 # * Caches downloaded dependencies and plugins between invocation.
 # * Verify but don't deploy merge requests.
-# * Deploy built artifacts from the default branch only.
+# * Deploy built artifacts from master branch only.
 variables:
  # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
@@ -33,8 +33,7 @@ cache:
  script:
    - 'mvn $MAVEN_CLI_OPTS verify'
  except:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 # Verify merge requests using JDK8
 verify:jdk8:
@@ -43,7 +42,7 @@ verify:jdk8:
 # To deploy packages from CI, create a ci_settings.xml file
 # For deploying packages to GitLab's Maven Repository: See https://docs.gitlab.com/ee/user/project/packages/maven_repository.html#creating-maven-packages-with-gitlab-cicd for more details.
 # Please note: The GitLab Maven Repository is currently only available in GitLab Premium / Ultimate.
-# For the default branch run `mvn deploy` automatically.
+# For `master` branch run `mvn deploy` automatically.
 deploy:jdk8:
  stage: deploy
  script:
@@ -52,5 +51,4 @@ deploy:jdk8:
      fi
    - 'mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml'
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Mono.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Mono.gitlab-ci.yml
@@ -25,8 +25,7 @@ before_script:
 release:
  stage: deploy
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
  artifacts:
    paths:
      - build/release/MyProject.exe

--- a/lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml
@@ -49,8 +49,7 @@ review:
  only:
    - branches
  except:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 stop-review:
  <<: *deploy
@@ -67,8 +66,7 @@ stop-review:
  only:
    - branches
  except:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 staging:
  <<: *deploy
@@ -80,8 +78,7 @@ staging:
    name: staging
    url: http://$CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 production:
  <<: *deploy
@@ -94,5 +91,4 @@ production:
    name: production
    url: http://$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Packer.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Packer.gitlab-ci.yml
@@ -25,5 +25,4 @@ build:
    - find . -maxdepth 1 -name '*.json' -print0 | xargs -t0n1 packer build
  when: manual
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Brunch.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Brunch.gitlab-ci.yml
@@ -12,5 +12,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml
@@ -10,5 +10,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Gatsby.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Gatsby.gitlab-ci.yml
@@ -14,5 +14,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml
@@ -9,5 +9,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml
@@ -12,5 +12,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml
@@ -14,5 +14,4 @@ pages:
      - node_modules
    key: project
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Hugo.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Hugo.gitlab-ci.yml
@@ -8,12 +8,10 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 test:
  script:
    - hugo
  except:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Hyde.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Hyde.gitlab-ci.yml
@@ -11,8 +11,7 @@ test:
    - pip install hyde
    - hyde gen
  except:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 pages:
  stage: deploy
@@ -23,5 +22,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Jekyll.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Jekyll.gitlab-ci.yml
@@ -17,8 +17,7 @@ test:
    paths:
      - test
  except:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 pages:
  stage: deploy
@@ -28,5 +27,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml
@@ -34,5 +34,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Lektor.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Lektor.gitlab-ci.yml
@@ -9,5 +9,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Metalsmith.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Metalsmith.gitlab-ci.yml
@@ -13,5 +13,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Middleman.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Middleman.gitlab-ci.yml
@@ -12,8 +12,7 @@ test:
    - bundle install --path vendor
    - bundle exec middleman build
  except:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
 pages:
  script:
@@ -25,5 +24,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Nanoc.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Nanoc.gitlab-ci.yml
@@ -9,5 +9,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/Octopress.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/Octopress.gitlab-ci.yml
@@ -12,5 +12,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Pages/SwaggerUI.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Pages/SwaggerUI.gitlab-ci.yml
@@ -26,5 +26,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Python.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Python.gitlab-ci.yml
@@ -48,5 +48,4 @@ pages:
    paths:
      - public
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
--- a/lib/gitlab/ci/templates/Swift.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Swift.gitlab-ci.yml
@@ -22,8 +22,7 @@ archive_project:
    - xcodebuild clean archive -archivePath build/ProjectName -scheme SchemeName
    - xcodebuild -exportArchive -exportFormat ipa -archivePath "build/ProjectName.xcarchive" -exportPath "build/ProjectName.ipa" -exportProvisioningProfile "ProvisioningProfileName"
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME
  artifacts:
    paths:
      - build/ProjectName.ipa

--- a/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Terraform.gitlab-ci.yml
@@ -53,5 +53,4 @@ apply:
    - plan
  when: manual
  only:
-    variables:
+    - master
-      - $CI_DEFAULT_BRANCH == $CI_COMMIT_REF_NAME