Merge branch 'master' of github.com:elastic/apm-server into data-stre…

…am-and-other-docs
elastic · Nov 11, 2021 · 37170c9 · 37170c9
2 parents 65a8a52 + 4406146
commit 37170c9
Show file tree

Hide file tree

Showing 121 changed files with 1,515 additions and 2,401 deletions.
diff --git a/.ci/jobs/apm-server-check-changelogs-mbp.yml b/.ci/jobs/apm-server-check-changelogs-mbp.yml
@@ -12,7 +12,7 @@
         discover-pr-forks-trust: permission
         discover-pr-origin: merge-current
         discover-tags: false
-        head-filter-regex: '^(?!update-stack-version).*$'
+        head-filter-regex: '(master|6\.8|7\.16|8\.\d+|PR-.*)'
         notification-context: 'apm-ci'
         property-strategies:
           all-branches:

diff --git a/.ci/jobs/apm-server-check-packages-mbp.yml b/.ci/jobs/apm-server-check-packages-mbp.yml
@@ -12,7 +12,7 @@
         discover-pr-forks-trust: permission
         discover-pr-origin: merge-current
         discover-tags: false
-        head-filter-regex: '(master|7\.1\d|8\.\d+)'
+        head-filter-regex: '(master|7\.16|8\.\d+)'
         notification-context: 'beats-tester'
         build-strategies:
         - skip-initial-build: true

diff --git a/.ci/jobs/apm-server-mbp.yml b/.ci/jobs/apm-server-mbp.yml
@@ -13,7 +13,7 @@
         discover-pr-forks-trust: permission
         discover-pr-origin: merge-current
         discover-tags: true
-        head-filter-regex: '^(?!update-stack-version).*$'
+        head-filter-regex: '(master|6\.8|7\.16|8\.\d+|PR-.*|v[0-9].*)'
         notification-context: 'apm-ci'
         repo: apm-server
         repo-owner: elastic

diff --git a/.ci/jobs/update-json-schema.yml b/.ci/jobs/update-json-schema.yml
@@ -13,7 +13,7 @@
           discover-pr-forks-trust: permission
           discover-pr-origin: merge-current
           discover-tags: false
-          head-filter-regex: '^(?!update-stack-version).*$'
+          head-filter-regex: '^(master|PR-.*)$'
           notification-context: 'update-json-schema'
           repo: apm-server
           repo-owner: elastic

diff --git a/.ci/scripts/linux-test.sh b/.ci/scripts/linux-test.sh
@@ -13,6 +13,9 @@ trap cleanup EXIT
 
 make update apm-server
 
+# Start docker-compose environment first, so it doesn't count towards the test timeout.
+docker-compose up -d
+
 SYSTEM_TESTS_XUNIT_PATH="$(pwd)/build"
 # TODO(axw) make this a Makefile target
 # TODO(mdelapenya) meanwhile there is no 'DefaultGoTestSystemArgs' at beats' GoTest implementation, this command is reproducing what Beats should provide: a gotestsum representation for system tests.

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -364,9 +364,6 @@ pipeline {
                   keepLongStdio: true,
                   testResults: "TEST-*.xml"
                 )
-                catchError(buildResult: 'SUCCESS', message: 'Failed to grab test results tar files', stageResult: 'SUCCESS') {
-                  tar(file: "system-tests-linux-files.tgz", archive: true, dir: "system-tests")
-                }
               }
             }
           }

diff --git a/Makefile b/Makefile
@@ -110,7 +110,7 @@ NOTICE.txt: $(PYTHON) go.mod tools/go.mod
 add-headers: $(GOLICENSER)
 ifndef CHECK_HEADERS_DISABLED
 	@$(GOLICENSER) -exclude x-pack -exclude internal/otel_collector
-	@$(GOLICENSER) -license Elastic x-pack
+	@$(GOLICENSER) -license Elasticv2 x-pack
 endif
 
 ## get-version : Get the apm server version
@@ -174,7 +174,7 @@ check-changelogs: $(PYTHON)
 check-headers: $(GOLICENSER)
 ifndef CHECK_HEADERS_DISABLED
 	@$(GOLICENSER) -d -exclude build -exclude x-pack -exclude internal/otel_collector
-	@$(GOLICENSER) -d -exclude build -license Elastic x-pack
+	@$(GOLICENSER) -d -exclude build -license Elasticv2 x-pack
 endif
 
 .PHONY: check-docker-compose