Merge branch 'revert-9dafee7b' into 'master'

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

See merge request gitlab-org/gitlab!19334

lib/gitlab/ci/templates/Android-Fastlane.gitlab-ci.yml

@@ -113,9 +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:
-    - $CI_DEFAULT_BRANCH
+    - master
   script:
     - bundle exec fastlane promote_beta_to_production

lib/gitlab/ci/templates/Docker.gitlab-ci.yml

@@ -10,7 +10,7 @@ docker-build-master:
     - docker build --pull -t "$CI_REGISTRY_IMAGE" .
     - docker push "$CI_REGISTRY_IMAGE"
   only:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 docker-build:
   # Official docker image.
@@ -24,4 +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:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml

@@ -25,7 +25,7 @@ review:
     kubernetes: active
   except:
     refs:
-      - $CI_DEFAULT_BRANCH
+      - master
     variables:
       - $REVIEW_DISABLED
 
@@ -49,7 +49,7 @@ stop_review:
     kubernetes: active
   except:
     refs:
-      - $CI_DEFAULT_BRANCH
+      - master
     variables:
       - $REVIEW_DISABLED
 
@@ -74,7 +74,7 @@ staging:
     url: http://$CI_PROJECT_PATH_SLUG-staging.$KUBE_INGRESS_BASE_DOMAIN
   only:
     refs:
-      - $CI_DEFAULT_BRANCH
+      - master
     kubernetes: active
     variables:
       - $STAGING_ENABLED
@@ -99,7 +99,7 @@ canary:
   when: manual
   only:
     refs:
-      - $CI_DEFAULT_BRANCH
+      - master
     kubernetes: active
     variables:
       - $CANARY_ENABLED
@@ -127,7 +127,7 @@ production:
   <<: *production_template
   only:
     refs:
-      - $CI_DEFAULT_BRANCH
+      - master
     kubernetes: active
   except:
     variables:
@@ -142,7 +142,7 @@ production_manual:
   allow_failure: false
   only:
     refs:
-      - $CI_DEFAULT_BRANCH
+      - master
     kubernetes: active
     variables:
       - $STAGING_ENABLED
@@ -152,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
@@ -179,7 +179,7 @@ production_manual:
   # This selectors are backward compatible mode with $INCREMENTAL_ROLLOUT_ENABLED (before 11.4)
   only:
     refs:
-      - $CI_DEFAULT_BRANCH
+      - master
     kubernetes: active
     variables:
       - $INCREMENTAL_ROLLOUT_MODE == "manual"
@@ -194,7 +194,7 @@ production_manual:
   start_in: 5 minutes
   only:
     refs:
-      - $CI_DEFAULT_BRANCH
+      - master
     kubernetes: active
     variables:
       - $INCREMENTAL_ROLLOUT_MODE == "timed"

lib/gitlab/ci/templates/Julia.gitlab-ci.yml

@@ -64,7 +64,7 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 # WARNING: This template is using the `julia` images from [Docker
 # Hub][3]. One can use custom Julia images and/or the official ones found

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,7 +33,7 @@ cache:
   script:
     - 'mvn $MAVEN_CLI_OPTS verify'
   except:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 # Verify merge requests using JDK8
 verify:jdk8:
@@ -42,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:
@@ -51,4 +51,4 @@ deploy:jdk8:
       fi
     - 'mvn $MAVEN_CLI_OPTS deploy -s ci_settings.xml'
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Mono.gitlab-ci.yml

@@ -25,7 +25,7 @@ before_script:
 release:
   stage: deploy
   only:
-    - $CI_DEFAULT_BRANCH
+    - master
   artifacts:
     paths:
       - build/release/MyProject.exe

lib/gitlab/ci/templates/OpenShift.gitlab-ci.yml

@@ -49,7 +49,7 @@ review:
   only:
     - branches
   except:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 stop-review:
   <<: *deploy
@@ -66,7 +66,7 @@ stop-review:
   only:
     - branches
   except:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 staging:
   <<: *deploy
@@ -78,7 +78,7 @@ staging:
     name: staging
     url: http://$CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
   only:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 production:
   <<: *deploy
@@ -91,4 +91,4 @@ production:
     name: production
     url: http://$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Packer.gitlab-ci.yml

@@ -25,4 +25,4 @@ build:
     - find . -maxdepth 1 -name '*.json' -print0 | xargs -t0n1 packer build
   when: manual
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Brunch.gitlab-ci.yml

@@ -12,4 +12,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Doxygen.gitlab-ci.yml

@@ -10,4 +10,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Gatsby.gitlab-ci.yml

@@ -14,4 +14,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/HTML.gitlab-ci.yml

@@ -9,4 +9,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Harp.gitlab-ci.yml

@@ -12,4 +12,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Hexo.gitlab-ci.yml

@@ -14,4 +14,4 @@ pages:
       - node_modules
     key: project
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Hugo.gitlab-ci.yml

@@ -8,10 +8,10 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 test:
   script:
     - hugo
   except:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Hyde.gitlab-ci.yml

@@ -11,7 +11,7 @@ test:
     - pip install hyde
     - hyde gen
   except:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 pages:
   stage: deploy
@@ -22,4 +22,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Jekyll.gitlab-ci.yml

@@ -17,7 +17,7 @@ test:
     paths:
       - test
   except:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 pages:
   stage: deploy
@@ -27,4 +27,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Jigsaw.gitlab-ci.yml

@@ -34,4 +34,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Lektor.gitlab-ci.yml

@@ -9,4 +9,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Metalsmith.gitlab-ci.yml

@@ -13,4 +13,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Middleman.gitlab-ci.yml

@@ -12,7 +12,7 @@ test:
     - bundle install --path vendor
     - bundle exec middleman build
   except:
-    - $CI_DEFAULT_BRANCH
+    - master
 
 pages:
   script:
@@ -24,4 +24,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Nanoc.gitlab-ci.yml

@@ -9,4 +9,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/Octopress.gitlab-ci.yml

@@ -12,4 +12,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Pages/SwaggerUI.gitlab-ci.yml

@@ -26,4 +26,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Python.gitlab-ci.yml

@@ -48,4 +48,4 @@ pages:
     paths:
       - public
   only:
-    - $CI_DEFAULT_BRANCH
+    - master

lib/gitlab/ci/templates/Swift.gitlab-ci.yml

@@ -22,7 +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:
-    - $CI_DEFAULT_BRANCH
+    - master
   artifacts:
     paths:
       - build/ProjectName.ipa

lib/gitlab/ci/templates/Terraform.gitlab-ci.yml

@@ -53,4 +53,4 @@ apply:
     - plan
   when: manual
   only:
-    - $CI_DEFAULT_BRANCH
+    - master