Label action

.backportrc.json

@@ -1,5 +1,7 @@
 {
   "upstream": "elastic/apm-server",
-  "branches": [{ "name": "7.x", "checked": true }, "7.9", "7.8", "7.7", "7.6", "7.5", "7.4", "7.3", "7.2", "7.1", "7.0", "6.8"],
-  "labels": ["backport"]
+  "branches": [{ "name": "7.x", "checked": true },"7.15", "7.14", "6.8"],
+  "labels": ["backport"],
+  "autoMerge": true,
+  "autoMergeMethod": "squash"
 }

.ci/.jenkins-schema.yml

@@ -0,0 +1,16 @@
+---
+agents:
+  - REPO: "apm-agent-dotnet"
+    SPEC_FILEPATH: "src/Elastic.Apm.Specification/specs"
+  - REPO: "apm-agent-go"
+    SPEC_FILEPATH: "internal/apmschema/jsonschema"
+  - REPO: "apm-agent-java"
+    SPEC_FILEPATH: "apm-agent-core/src/test/resources/apm-server-schema/current"
+  - REPO: "apm-agent-nodejs"
+    SPEC_FILEPATH: "test/integration/api-schema/apm-server-schema"
+  - REPO: "apm-agent-php"
+    SPEC_FILEPATH: "tests/APM_Server_intake_API_schema/latest_used"
+  - REPO: "apm-agent-python"
+    SPEC_FILEPATH: "tests/upstream/json-specs"
+  - REPO: "apm-agent-ruby"
+    SPEC_FILEPATH: "spec/fixtures"

.ci/bump-stack-version.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+#
+# Given the stack version this script will bump the version.
+#
+# This script is executed by the automation we are putting in place
+# and it requires the git add/commit commands.
+#
+# Parameters:
+#	$1 -> the version to be bumped. Mandatory.
+#	$2 -> whether to create a branch where to commit the changes to.
+#		  this is required when reusing an existing Pull Request.
+#		  Optional. Default true.
+#
+set -euo pipefail
+MSG="parameter missing."
+VERSION=${1:?$MSG}
+CREATE_BRANCH=${2:-true}
+
+OS=$(uname -s| tr '[:upper:]' '[:lower:]')
+
+if [ "${OS}" == "darwin" ] ; then
+	SED="sed -i .bck"
+else
+	SED="sed -i"
+fi
+
+echo "Update stack with version ${VERSION}"
+${SED} -E -e "s#(image: docker\.elastic\.co/.*):[0-9]+\.[0-9]+\.[0-9]+(-[a-f0-9]{8})?#\1:${VERSION}#g" docker-compose.yml
+
+echo "Commit changes"
+if [ "$CREATE_BRANCH" = "true" ]; then
+	base=$(git rev-parse --abbrev-ref HEAD | sed 's#/#-#g')
+	git checkout -b "update-stack-version-$(date "+%Y%m%d%H%M%S")-${base}"
+else
+	echo "Branch creation disabled."
+fi
+git add docker-compose.yml
+git diff --staged --quiet || git commit -m "[Automation] Update elastic stack version to ${VERSION} for testing"
+git --no-pager log -1
+
+echo "You can now push and create a Pull Request"

.ci/check-changelogs.groovy

@@ -49,7 +49,7 @@ pipeline {
         deleteDir()
         unstash 'source'
         dir("${BASE_DIR}"){
-          sh(label: 'Run check changelogs', script: './script/jenkins/check-changelogs.sh')
+          sh(label: 'Run check changelogs', script: './.ci/scripts/check-changelogs.sh')
         }
       }
     }

.ci/check-packages.groovy

@@ -7,15 +7,12 @@ pipeline {
   environment {
     BASE_DIR = 'src'
     PIPELINE_LOG_LEVEL = 'INFO'
-    URL_BASE = "${params.URL_BASE}"
-    VERSION = "${params.VERSION}"
     HOME = "${WORKSPACE}"
     // This limits ourselves to just the APM tests
     ANSIBLE_EXTRA_FLAGS = "--tags apm-server"
-    // The build parameters
-    BEATS_URL_BASE = 'https://storage.googleapis.com/beats-ci-artifacts/snapshots'
-    APM_URL_BASE = 'https://storage.googleapis.com/apm-ci-artifacts/jobs/snapshots'
-    // BRANCH_NAME = 'master'
+    LANG = "C.UTF-8"
+    LC_ALL = "C.UTF-8"
+    PYTHONUTF8 = "1"
   }
   options {
     timeout(time: 4, unit: 'HOURS')
@@ -28,14 +25,40 @@ pipeline {
     rateLimitBuilds(throttle: [count: 60, durationName: 'hour', userBoost: true])
   }
   triggers {
-    cron '@weekly'
+    upstream("apm-server/apm-server-mbp/${env.JOB_BASE_NAME}")
+  }
+  parameters {
+    string(name: 'APM_URL_BASE', defaultValue: 'https://storage.googleapis.com/apm-ci-artifacts/jobs/snapshots', description: 'The location where the APM packages should be downloaded from')
+    string(name: 'VERSION', defaultValue: '8.0.0-SNAPSHOT', description: 'The package version to test (modify the job configuration to add a new version)')
   }
   stages {
     stage('Checkout') {
       options { skipDefaultCheckout() }
       steps {
         pipelineManager([ cancelPreviousRunningBuilds: [ when: 'PR' ] ])
         deleteDir()
+        script {
+          if(isUpstreamTrigger()) {
+            try {
+              log(level: 'INFO', text: "Started by upstream pipeline. Read 'beats-tester.properties'.")
+              copyArtifacts(filter: 'beats-tester.properties',
+                            flatten: true,
+                            projectName: "apm-server/apm-server-mbp/${env.JOB_BASE_NAME}",
+                            selector: upstream(fallbackToLastSuccessful: true))
+              def props = readProperties(file: 'beats-tester.properties')
+              setEnvVar('APM_URL_BASE', props.get('APM_URL_BASE', ''))
+              setEnvVar('VERSION', props.get('VERSION', '8.0.0-SNAPSHOT'))
+            } catch(err) {
+              log(level: 'WARN', text: "copyArtifacts failed. Fallback to the head of the branch as used to be.")
+              setEnvVar('APM_URL_BASE', params.get('APM_URL_BASE', 'https://storage.googleapis.com/apm-ci-artifacts/jobs/snapshots'))
+              setEnvVar('VERSION', params.get('VERSION', '8.0.0-SNAPSHOT'))
+            }
+          } else {
+            log(level: 'INFO', text: "No started by upstream pipeline. Fallback to the head of the branch as used to be.")
+            setEnvVar('APM_URL_BASE', params.get('APM_URL_BASE'))
+            setEnvVar('VERSION', params.get('VERSION'))
+          }
+        }
         gitCheckout(basedir: "${BASE_DIR}", repo: '[email protected]:elastic/beats-tester.git', branch: 'master', credentialsId: 'f6c7695a-671e-4f4f-a331-acdce44ff9ba')
         stash allowEmpty: true, name: 'source', useDefaultExcludes: false
       }
@@ -44,7 +67,7 @@ pipeline {
       matrix {
         // TODO: when the infra is ready with the 'nested-virtualization' then we can use that label
         // agent { label 'nested-virtualization' }
-        agent { label 'darwin' }
+        agent { label 'metal' }
         axes {
           axis {
             name 'GROUPS'
@@ -57,16 +80,13 @@ pipeline {
           stage('Test'){
             options { skipDefaultCheckout() }
             steps {
-              // See https://stackoverflow.com/questions/59269208/errorrootcode-for-hash-md5-was-not-found-when-using-any-hg-mercurial-command
-              sh(label: "Switching OpenSSL versions to fix Py2", script: "brew switch openssl 1.0.2s")
               deleteDir()
               unstash 'source'
               dir("${BASE_DIR}"){
-                withGoEnv(){
+                withGoEnv(os: 'linux'){
                   sh(label: 'make batch',
                     script: """#!/bin/bash
-                      echo "beats_url_base: ${BEATS_URL_BASE}" > run-settings-jenkins.yml
-                      echo "apm_url_base: ${APM_URL_BASE}" >> run-settings-jenkins.yml
+                      echo "apm_url_base: ${APM_URL_BASE}" > run-settings-jenkins.yml
                       echo "version: ${VERSION}" >> run-settings-jenkins.yml
                       RUN_SETTINGS=jenkins make batch""")
                 }
@@ -77,7 +97,7 @@ pipeline {
                 dir("${BASE_DIR}"){
                   junit(allowEmptyResults: true, keepLongStdio: true, testResults: "logs/*.xml")
                   archiveArtifacts(allowEmptyArchive: true, artifacts: 'logs/**')
-                  withGoEnv(){
+                  withGoEnv(os: 'linux'){
                     sh(label: 'make clean', script: 'make clean')
                   }
                 }
@@ -93,7 +113,7 @@ pipeline {
   }
   post {
     cleanup {
-      notifyBuildResult(prComment: true)
+      notifyBuildResult(prComment: false)
     }
   }
 }

.ci/jobs/apm-server-check-changelogs-mbp.yml

@@ -12,6 +12,7 @@
         discover-pr-forks-trust: permission
         discover-pr-origin: merge-current
         discover-tags: false
+        head-filter-regex: '^(?!update-stack-version).*$'
         notification-context: 'apm-ci'
         property-strategies:
           all-branches:
@@ -37,4 +38,3 @@
         timeout: '15'
         use-author: true
         wipe-workspace: 'True'
-    periodic-folder-trigger: 1w

.ci/jobs/apm-server-check-packages-mbp.yml

@@ -0,0 +1,51 @@
+---
+- job:
+    name: apm-server/apm-server-check-packages-mbp
+    display-name: APM Server Package Smoke Test MBP
+    description: Test package installation across supported platforms
+    project-type: multibranch
+    script-path: .ci/check-packages.groovy
+    scm:
+    - github:
+        branch-discovery: no-pr
+        discover-pr-forks-strategy: merge-current
+        discover-pr-forks-trust: permission
+        discover-pr-origin: merge-current
+        discover-tags: false
+        head-filter-regex: '(master|7\.1\d|8\.\d+)'
+        notification-context: 'beats-tester'
+        build-strategies:
+        - skip-initial-build: true
+        - named-branches:
+            - exact-name:
+                name: 'master'
+                case-sensitive: true
+            - regex-name:
+                regex: '7\.1\d'
+                case-sensitive: true
+            - regex-name:
+                regex: '8\.\d+'
+                case-sensitive: true
+        - change-request:
+            ignore-target-only-changes: true
+        repo: apm-server
+        repo-owner: elastic
+        credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken
+        ssh-checkout:
+          credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba
+        clean:
+          after: true
+          before: true
+        prune: true
+        shallow-clone: true
+        depth: 3
+        do-not-fetch-tags: true
+        submodule:
+          disable: false
+          recursive: true
+          parent-credentials: true
+          timeout: 100
+          reference-repo: /var/lib/jenkins/.git-references/apm-server.git
+        timeout: '15'
+        use-author: true
+        wipe-workspace: 'True'