Revert "Merge remote-tracking branch 'upstream'"

This reverts commit e887c1a, reversing
changes made to 0d322bf.

Author: kaiyan-sheng

.ci/apm-beats-update.groovy

@@ -81,7 +81,7 @@ pipeline {
           when {
             beforeAgent true
             anyOf {
-              branch 'main'
+              branch 'master'
               branch "\\d+\\.\\d+"
               branch "v\\d?"
               tag "v\\d+\\.\\d+\\.\\d+*"

.ci/beats-tester-bc.groovy

@@ -24,7 +24,7 @@ pipeline {
   }
   parameters {
     string(name: 'version', defaultValue: '', description: 'Id of the Build Candidate (7.10.0-b55684ff).')
-    string(name: 'BRANCH_REFERENCE', defaultValue: 'main', description: 'Branch to grab the Groovy script(for test changes).')
+    string(name: 'BRANCH_REFERENCE', defaultValue: 'master', description: 'Branch to grab the Groovy script(for test changes).')
   }
   stages {
     stage('Run Beat Tester') {

.ci/beats-tester.groovy

@@ -50,9 +50,9 @@ pipeline {
             setEnvVar('VERSION', sh(script: "grep ':stack-version:' ${BASE_DIR}/libbeat/docs/version.asciidoc | cut -d' ' -f2", returnStdout: true).trim())
           }
         }
-        stage('Build main') {
+        stage('Build master') {
           options { skipDefaultCheckout() }
-          when { branch 'main' }
+          when { branch 'master' }
           steps {
             runBeatsTesterJob(version: "${env.VERSION}-SNAPSHOT")
           }
@@ -78,7 +78,7 @@ pipeline {
           when {
             not {
               anyOf {
-                branch comparator: 'REGEXP', pattern: '(main|.*x)'
+                branch comparator: 'REGEXP', pattern: '(master|.*x)'
                 changeRequest()
               }
             }

.ci/build-docker-images.groovy

@@ -29,7 +29,7 @@ pipeline {
   }
   parameters {
     booleanParam(name: "RELEASE_TEST_IMAGES", defaultValue: "true", description: "If it's needed to build & push Beats' test images")
-    string(name: 'BRANCH_REFERENCE', defaultValue: "main", description: "Git branch/tag to use")
+    string(name: 'BRANCH_REFERENCE', defaultValue: "master", description: "Git branch/tag to use")
   }
   stages {
     stage('Checkout') {

.ci/jobs/apm-beats-update.yml

@@ -1,7 +1,7 @@
 - job:
     name: Beats/apm-beats-update
     display-name: 'APM Server Beats update'
-    description: 'Check if the Beats lib update works on the APM server main branch'
+    description: 'Check if the Beats lib update works on the APM server master branch'
     view: Beats
     concurrent: true
     project-type: multibranch
@@ -18,7 +18,7 @@
         discover-pr-forks-trust: 'permission'
         discover-pr-origin: 'merge-current'
         discover-tags: true
-        head-filter-regex: '(main|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
+        head-filter-regex: '(master|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
         disable-pr-notifications: true
         notification-context: 'apm-beats-update'
         repo: 'beats'
@@ -33,7 +33,7 @@
             ignore-tags-newer-than: 30
         - named-branches:
             - exact-name:
-                name: 'main'
+                name: 'master'
                 case-sensitive: true
             - regex-name:
                 regex: '7\.1[6789]'

.ci/jobs/beats-schedule-daily.yml

@@ -8,7 +8,7 @@
     parameters:
       - string:
           name: branch_specifier
-          default: main
+          default: master
           description: the Git branch specifier to build
     pipeline-scm:
       script-path: .ci/schedule-daily.groovy

.ci/jobs/beats-schedule-weekly.yml

@@ -8,7 +8,7 @@
     parameters:
       - string:
           name: branch_specifier
-          default: main
+          default: master
           description: the Git branch specifier to build
     pipeline-scm:
       script-path: .ci/schedule-weekly.groovy

.ci/jobs/beats-test-infra.yml

@@ -17,6 +17,6 @@
             credentials-id: f6c7695a-671e-4f4f-a331-acdce44ff9ba
             reference-repo: /var/lib/jenkins/.git-references/apm-test-pipeline.git
             branches:
-                - main
+                - master
     triggers:
         - timed: 'H H(3-4) * * 1-5'

.ci/jobs/beats-tester-bc.yml

@@ -9,7 +9,7 @@
     parameters:
       - string:
           name: BRANCH_REFERENCE
-          default: main
+          default: master
           description: the Git branch specifier
     pipeline-scm:
       script-path: .ci/beats-tester-bc.groovy

.ci/jobs/beats-tester.yml

@@ -14,7 +14,7 @@
           discover-pr-forks-trust: 'permission'
           discover-pr-origin: 'merge-current'
           discover-tags: true
-          head-filter-regex: '(main|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
+          head-filter-regex: '(master|7\.1[6789]|8\.\d+|PR-.*|v\d+\.\d+\.\d+)'
           disable-pr-notifications: true
           notification-context: 'beats-tester'
           repo: 'beats'
@@ -29,7 +29,7 @@
               ignore-tags-newer-than: 30
           - named-branches:
               - exact-name:
-                  name: 'main'
+                  name: 'master'
                   case-sensitive: true
               - regex-name:
                   regex: '7\.1[6789]'