diff --git a/.ci/jobs/apm-ui-e2e-tests-mbp.yml b/.ci/jobs/apm-ui-e2e-tests-mbp.yml deleted file mode 100644 index 0d41c650a..000000000 --- a/.ci/jobs/apm-ui-e2e-tests-mbp.yml +++ /dev/null @@ -1,42 +0,0 @@ ---- -- job: - name: apm-ui/apm-ui-e2e-tests-mbp - display-name: APM UI e2e tests Pipeline - description: Jenkins pipeline to run the end2end tests for the APM UI - project-type: multibranch - script-path: .ci/end2end.groovy - disabled: false - 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|PR-[789].*|PR-[0-9]{1,6}.*)' - repo: kibana - repo-owner: elastic - credentials-id: 2a9602aa-ab9f-4e52-baf3-b71ca88469c7-UserAndToken - reference-repo: /var/lib/jenkins/.git-references/kibana.git - ssh-checkout: - credentials: f6c7695a-671e-4f4f-a331-acdce44ff9ba - build-strategies: - - regular-branches: false - - change-request: - ignore-target-only-changes: true - 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 - timeout: '15' - use-author: true - wipe-workspace: 'True' - disable-pr-notifications: true diff --git a/.ci/jobs/apm-ui.yml b/.ci/jobs/apm-ui.yml deleted file mode 100644 index a5f7c704a..000000000 --- a/.ci/jobs/apm-ui.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- job: - name: apm-ui - description: apm-ui - project-type: folder diff --git a/.ci/schedule-weekly.groovy b/.ci/schedule-weekly.groovy index 8c2795749..1b90a5a5a 100644 --- a/.ci/schedule-weekly.groovy +++ b/.ci/schedule-weekly.groovy @@ -40,9 +40,9 @@ pipeline { stage('Top failing Beats tests - last 7 days') { steps { setEnvVar('YYYY_MM_DD', new Date().format("yyyy-MM-dd", TimeZone.getTimeZone('UTC'))) - runWatcher(watcher: 'report-beats-top-failing-tests-weekly-master', subject: "[master] ${env.YYYY_MM_DD}: Top failing Beats tests - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co') - runWatcher(watcher: 'report-beats-top-failing-tests-weekly-7.x', subject: "[7.x] ${env.YYYY_MM_DD}: Top failing Beats tests - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co') - runWatcher(watcher: 'report-beats-top-failing-tests-weekly-7-release', subject: "[7-release] ${env.YYYY_MM_DD}: Top failing Beats tests - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co') + runWatcher(watcher: 'report-beats-top-failing-tests-weekly-master', subject: "[master] ${env.YYYY_MM_DD}: Top failing Beats tests in master branch - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co') + runWatcher(watcher: 'report-beats-top-failing-tests-weekly-7.x', subject: "[7.x] ${env.YYYY_MM_DD}: Top failing Beats tests in 7.x branch - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co') + runWatcher(watcher: 'report-beats-top-failing-tests-weekly-7-release', subject: "[7-release] ${env.YYYY_MM_DD}: Top failing Beats tests in 7 release branch - last 7 days", sendEmail: true, to: 'beats-contrib@elastic.co') } } stage('Sync GitHub labels') { diff --git a/CHANGELOG.md b/CHANGELOG.md index 82d283d9f..e9f7e20aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +## v1.1.234 (23/08/2021) + +#### ⚙️ CI + +- Adjust weekly Beats headers to outsmart Google [#1246](https://github.com/elastic/apm-pipeline-library/pull/1246) + +## v1.1.233 (04/08/2021) + +#### 🚀 Enhancements + +- Add OTEL_SERVICE_NAME env variable [#1226](https://github.com/elastic/apm-pipeline-library/pull/1226) +- [**Team:Automation**] Add parameters [#1230](https://github.com/elastic/apm-pipeline-library/pull/1230) +- [**Team:Automation**] feat: pipeline to destroy clusters [#1229](https://github.com/elastic/apm-pipeline-library/pull/1229) + +#### 🐛 Bug Fixes + +- randomString without starting with - [#1235](https://github.com/elastic/apm-pipeline-library/pull/1235) + ## v1.1.232 (29/07/2021) *No changelog for this release.* diff --git a/pom.xml b/pom.xml index 8c28b91ee..934043853 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 co.elastic jenkins-library - 1.1.233-SNAPSHOT + 1.1.235-SNAPSHOT APM Pipeline Shared Library Pipeline Shared Library containing utility steps. https://github.com/elastic/apm-pipeline-library @@ -44,7 +44,7 @@ com.github.tomakehurst wiremock-jre8 - 2.29.1 + 2.30.0 test @@ -96,7 +96,7 @@ io.jenkins.plugins opentelemetry - 0.16 + 0.17 @@ -213,7 +213,7 @@ maven-enforcer-plugin - 3.0.0-M3 + 3.0.0 display-info diff --git a/src/test/groovy/RandomStringStepTest.groovy b/src/test/groovy/RandomStringStepTest.groovy index ccd75a7cb..14d5d268d 100644 --- a/src/test/groovy/RandomStringStepTest.groovy +++ b/src/test/groovy/RandomStringStepTest.groovy @@ -54,11 +54,18 @@ class RandomStringStepTests extends ApmBasePipelineTest { } @Test - void test_manipulateString_with_dash() throws Exception { + void test_manipulateString_with_ending_dash() throws Exception { def ret = script.manipulateString('a-b-c-d-e-', 6) printCallStack() println ret assertTrue(ret == 'a-b-ca') } + @Test + void test_manipulateString_with_starting_dash() throws Exception { + def ret = script.manipulateString('-a-b-c-d-e', 6) + printCallStack() + println ret + assertTrue(ret == 'aa-b-c') + } } diff --git a/vars/randomString.groovy b/vars/randomString.groovy index e53176e67..3beb5868d 100644 --- a/vars/randomString.groovy +++ b/vars/randomString.groovy @@ -38,8 +38,8 @@ def call(Map args = [:]) { } /** - Alphanumeric and dash are allowed but not ending with dash + Alphanumeric and dash are allowed but not ending nor starting with dash */ def manipulateString(String value, int size) { - return value.replaceAll("[\\W]|-", "-").take(size).replaceAll('-$', 'a') + return value.replaceAll("[\\W]|-", "-").take(size).replaceAll('-$', 'a').replaceAll('^-', 'a') }