Sync config v15.2.0 : Remove GITLAB_NOTIFY_{ON_BROKEN_BUILDS, PUSHER}

Introduced in v15.2.0
See upstream merge request:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/91024

Author: kkimurak

README.md

@@ -930,14 +930,6 @@ Global custom hooks directory. Defaults to `/home/git/gitlab-shell/hooks`.
 
 Sets the timeout for webhooks. Defaults to `10` seconds.
 
-##### `GITLAB_NOTIFY_ON_BROKEN_BUILDS`
-
-Enable or disable broken build notification emails. Defaults to `true`
-
-##### `GITLAB_NOTIFY_PUSHER`
-
-Add pusher to recipients list of broken build notification emails. Defaults to `false`
-
 ##### `GITLAB_REPOS_DIR`
 
 The git repositories folder in the container. Defaults to `/home/git/data/repositories`

assets/runtime/config/gitlabhq/gitlab.yml

@@ -621,12 +621,6 @@ production: &base
 
   gitlab_ci:
     # Default project notifications settings:
-    #
-    # Send emails only on broken builds (default: true)
-    all_broken_builds: {{GITLAB_NOTIFY_ON_BROKEN_BUILDS}}
-    #
-    # Add pusher to recipients list (default: false)
-    add_pusher: {{GITLAB_NOTIFY_PUSHER}}
 
     # The location where build traces are stored (default: builds/). Relative paths are relative to Rails.root
     builds_path: {{GITLAB_BUILDS_DIR}}

assets/runtime/env-defaults

@@ -248,8 +248,12 @@ GITLAB_MATTERMOST_URL=${GITLAB_MATTERMOST_URL:-https://mattermost.example.com}
 GITLAB_SECRETS_DB_KEY_BASE=${GITLAB_SECRETS_DB_KEY_BASE:-}
 GITLAB_SECRETS_SECRET_KEY_BASE=${GITLAB_SECRETS_SECRET_KEY_BASE:-}
 GITLAB_SECRETS_OTP_KEY_BASE=${GITLAB_SECRETS_OTP_KEY_BASE:-}
-GITLAB_NOTIFY_ON_BROKEN_BUILDS=${GITLAB_NOTIFY_ON_BROKEN_BUILDS:-true}
-GITLAB_NOTIFY_PUSHER=${GITLAB_NOTIFY_PUSHER:-false}
+if [[ -v GITLAB_NOTIFY_ON_BROKEN_BUILDS ]]; then
+  echo "GITLAB_NOTIFY_ON_BROKEN_BUILDS is removed in gitlab v15.2.0 and has no effect."
+fi
+if [[ -v GITLAB_NOTIFY_PUSHER ]]; then
+  echo "GITLAB_NOTIFY_PUSHER is removed in gitlab v15.2.0 and has no effect."
+fi
 
 GITLAB_ROBOTS_PATH=${GITLAB_ROBOTS_PATH:-${USERCONF_TEMPLATES_DIR}/gitlabhq/robots.txt}
 

assets/runtime/functions

@@ -990,8 +990,7 @@ gitlab_configure_rack_attack() {
 gitlab_configure_ci() {
   echo "Configuring gitlab::ci..."
   update_template ${GITLAB_CONFIG} \
-    GITLAB_NOTIFY_ON_BROKEN_BUILDS \
-    GITLAB_NOTIFY_PUSHER GITLAB_BUILDS_DIR
+    GITLAB_NOTIFY_ON_BROKEN_BUILDS
 }
 
 gitlab_configure_artifacts() {

contrib/docker-swarm/docker-compose.yml

@@ -64,9 +64,6 @@ services:
     - GITLAB_ROOT_PASSWORD=
     - GITLAB_ROOT_EMAIL=
 
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
     - [email protected]
     - [email protected]
     - [email protected]

docker-compose.swarm.yml

@@ -126,9 +126,6 @@ services:
     - GITLAB_ROOT_PASSWORD=
     - GITLAB_ROOT_EMAIL=
 
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
     - [email protected]
     - [email protected]
     - [email protected]

docker-compose.yml

@@ -66,9 +66,6 @@ services:
     - GITLAB_ROOT_PASSWORD=
     - GITLAB_ROOT_EMAIL=
 
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
     - [email protected]
     - [email protected]
     - [email protected]

docs/docker-compose-keycloak.yml

@@ -60,9 +60,6 @@ services:
     - GITLAB_ROOT_PASSWORD=<root-password>
     - GITLAB_ROOT_EMAIL=
 
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
-
     - [email protected]
     - [email protected]
     - [email protected]

docs/s3_compatible_storage.md

@@ -124,8 +124,6 @@ services:
     - GITLAB_SECRETS_OTP_KEY_BASE=long-and-random-alphanumeric-string
     - GITLAB_ROOT_PASSWORD=
     - GITLAB_ROOT_EMAIL=
-    - GITLAB_NOTIFY_ON_BROKEN_BUILDS=true
-    - GITLAB_NOTIFY_PUSHER=false
     - [email protected]
     - [email protected]
     - [email protected]

kubernetes/gitlab-rc.yml

@@ -40,11 +40,6 @@ spec:
         - name: GITLAB_SSH_PORT
           value: "22"
 
-        - name: GITLAB_NOTIFY_ON_BROKEN_BUILDS
-          value: "true"
-        - name: GITLAB_NOTIFY_PUSHER
-          value: "false"
-
         - name: GITLAB_BACKUP_SCHEDULE
           value: daily
         - name: GITLAB_BACKUP_TIME