From fea343f9d4563d4ca3ad329f5a2c39480a7ea5c7 Mon Sep 17 00:00:00 2001 From: Victor Martinez <VictorMartinezRubio@gmail.com> Date: Tue, 3 Nov 2020 12:30:58 +0000 Subject: [PATCH 1/3] [CI]: run packaging if ^go.mod changes --- Jenkinsfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 4925adc6ea89..8236ef55cf0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -61,6 +61,7 @@ pipeline { dir("${BASE_DIR}"){ // Skip all the stages except docs for PR's with asciidoc and md changes only setEnvVar('ONLY_DOCS', isGitRegionMatch(patterns: [ '.*\\.(asciidoc|md)' ], shouldMatchAll: true).toString()) + setEnvVar('GO_MOD_CHANGES', isGitRegionMatch(patterns: [ '^go.mod' ], shouldMatchAll: false).toString()) setEnvVar('GO_VERSION', readFile(".go-version").trim()) withEnv(["HOME=${env.WORKSPACE}"]) { retryWithSleep(retries: 2, seconds: 5){ sh(label: "Install Go ${env.GO_VERSION}", script: '.ci/scripts/install-go.sh') } @@ -122,6 +123,21 @@ pipeline { } } } + stage('Packaging') { + agent none + options { skipDefaultCheckout() } + when { + allOf { + expression { return env.GO_MOD_CHANGES == "true" } + changeRequest() + } + } + steps { + withGithubNotify(context: 'Packaging') { + build(job: "Beats/packaging/${env.BRANCH_NAME}", propagate: true, wait: true) + } + } + } } post { success { From bd1dd763a5688266dfaf255b81f6163ee6f4cd0a Mon Sep 17 00:00:00 2001 From: Victor Martinez <VictorMartinezRubio@gmail.com> Date: Tue, 3 Nov 2020 13:09:56 +0000 Subject: [PATCH 2/3] chore: for testing purposes chore: for testing purposes --- Jenkinsfile.yml | 19 ------------------- NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Jenkinsfile.yml b/Jenkinsfile.yml index 22fd31ae4b1e..b61e36996af5 100644 --- a/Jenkinsfile.yml +++ b/Jenkinsfile.yml @@ -1,23 +1,4 @@ projects: - - "auditbeat" - - "deploy/kubernetes" - - "filebeat" - - "generator" - - "heartbeat" - - "journalbeat" - - "libbeat" - - "metricbeat" - - "packetbeat" - - "winlogbeat" - - "x-pack/auditbeat" - - "x-pack/dockerlogbeat" - - "x-pack/elastic-agent" - - "x-pack/filebeat" - - "x-pack/functionbeat" - - "x-pack/libbeat" - - "x-pack/metricbeat" - - "x-pack/packetbeat" - - "x-pack/winlogbeat" - "dev-tools" ##- "x-pack/heartbeat" It's not yet in the 1.0 pipeline. ##- "x-pack/journalbeat" It's not yet in the 1.0 pipeline. diff --git a/NOTICE.txt b/NOTICE.txt index 640ee9045c71..a1d0090ca2b5 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2617,11 +2617,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/aws/aws-lambda-go -Version: v1.6.0 +Version: v1.7.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/aws/aws-lambda-go@v1.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/aws/aws-lambda-go@v1.7.0/LICENSE: Apache License diff --git a/go.mod b/go.mod index 60a2299a32e2..ea5f14b56d2e 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 // indirect github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 - github.com/aws/aws-lambda-go v1.6.0 + github.com/aws/aws-lambda-go v1.7.0 github.com/aws/aws-sdk-go-v2 v0.9.0 github.com/awslabs/goformation/v4 v4.1.0 github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 diff --git a/go.sum b/go.sum index 697368fe0ab8..549c645f8b78 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/aws/aws-lambda-go v1.6.0 h1:T+u/g79zPKw1oJM7xYhvpq7i4Sjc0iVsXZUaqRVVSOg= -github.com/aws/aws-lambda-go v1.6.0/go.mod h1:zUsUQhAUjYzR8AuduJPCfhBuKWUaDbQiPOG+ouzmE1A= +github.com/aws/aws-lambda-go v1.7.0 h1:g3Ad7aw27B2lhQLIuK7Aha+cWSaHr7ZNlngveHkhZyo= +github.com/aws/aws-lambda-go v1.7.0/go.mod h1:zUsUQhAUjYzR8AuduJPCfhBuKWUaDbQiPOG+ouzmE1A= github.com/aws/aws-sdk-go-v2 v0.9.0 h1:dWtJKGRFv3UZkMBQaIzMsF0/y4ge3iQPWTzeC4r/vl4= github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod h1:sa1GePZ/LfBGI4dSq30f6uR4Tthll8axxtEPvlpXZ8U= github.com/awslabs/goformation/v3 v3.1.0/go.mod h1:hQ5RXo3GNm2laHWKizDzU5DsDy+yNcenSca2UxN0850= From 625ff7ba9a63564c23d1f7de89f1d0d38a8b2b94 Mon Sep 17 00:00:00 2001 From: Victor Martinez <VictorMartinezRubio@gmail.com> Date: Tue, 3 Nov 2020 17:06:51 +0000 Subject: [PATCH 3/3] Revert "chore: for testing purposes" This reverts commit bd1dd763a5688266dfaf255b81f6163ee6f4cd0a. --- Jenkinsfile.yml | 19 +++++++++++++++++++ NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile.yml b/Jenkinsfile.yml index b61e36996af5..22fd31ae4b1e 100644 --- a/Jenkinsfile.yml +++ b/Jenkinsfile.yml @@ -1,4 +1,23 @@ projects: + - "auditbeat" + - "deploy/kubernetes" + - "filebeat" + - "generator" + - "heartbeat" + - "journalbeat" + - "libbeat" + - "metricbeat" + - "packetbeat" + - "winlogbeat" + - "x-pack/auditbeat" + - "x-pack/dockerlogbeat" + - "x-pack/elastic-agent" + - "x-pack/filebeat" + - "x-pack/functionbeat" + - "x-pack/libbeat" + - "x-pack/metricbeat" + - "x-pack/packetbeat" + - "x-pack/winlogbeat" - "dev-tools" ##- "x-pack/heartbeat" It's not yet in the 1.0 pipeline. ##- "x-pack/journalbeat" It's not yet in the 1.0 pipeline. diff --git a/NOTICE.txt b/NOTICE.txt index a1d0090ca2b5..640ee9045c71 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2617,11 +2617,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/aws/aws-lambda-go -Version: v1.7.0 +Version: v1.6.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/aws/aws-lambda-go@v1.7.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/aws/aws-lambda-go@v1.6.0/LICENSE: Apache License diff --git a/go.mod b/go.mod index ea5f14b56d2e..60a2299a32e2 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/antlr/antlr4 v0.0.0-20200820155224-be881fa6b91d github.com/apoydence/eachers v0.0.0-20181020210610-23942921fe77 // indirect github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 - github.com/aws/aws-lambda-go v1.7.0 + github.com/aws/aws-lambda-go v1.6.0 github.com/aws/aws-sdk-go-v2 v0.9.0 github.com/awslabs/goformation/v4 v4.1.0 github.com/blakesmith/ar v0.0.0-20150311145944-8bd4349a67f2 diff --git a/go.sum b/go.sum index 549c645f8b78..697368fe0ab8 100644 --- a/go.sum +++ b/go.sum @@ -119,8 +119,8 @@ github.com/armon/go-radix v1.0.0 h1:F4z6KzEeeQIMeLFa97iZU6vupzoecKdU5TX24SNppXI= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/aws/aws-lambda-go v1.7.0 h1:g3Ad7aw27B2lhQLIuK7Aha+cWSaHr7ZNlngveHkhZyo= -github.com/aws/aws-lambda-go v1.7.0/go.mod h1:zUsUQhAUjYzR8AuduJPCfhBuKWUaDbQiPOG+ouzmE1A= +github.com/aws/aws-lambda-go v1.6.0 h1:T+u/g79zPKw1oJM7xYhvpq7i4Sjc0iVsXZUaqRVVSOg= +github.com/aws/aws-lambda-go v1.6.0/go.mod h1:zUsUQhAUjYzR8AuduJPCfhBuKWUaDbQiPOG+ouzmE1A= github.com/aws/aws-sdk-go-v2 v0.9.0 h1:dWtJKGRFv3UZkMBQaIzMsF0/y4ge3iQPWTzeC4r/vl4= github.com/aws/aws-sdk-go-v2 v0.9.0/go.mod h1:sa1GePZ/LfBGI4dSq30f6uR4Tthll8axxtEPvlpXZ8U= github.com/awslabs/goformation/v3 v3.1.0/go.mod h1:hQ5RXo3GNm2laHWKizDzU5DsDy+yNcenSca2UxN0850=