From c5b3f2ae5b63208acc59e0ce5675f85679456824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?No=C3=A9mi=20V=C3=A1nyi?= Date: Thu, 18 Mar 2021 15:34:50 +0100 Subject: [PATCH 1/2] Update Golang to 1.15.9 (#24442) (#24514) (cherry picked from commit 416bc0010663db89459359874aaf0c4c20b9fdc4) --- .go-version | 2 +- CHANGELOG-developer.next.asciidoc | 1 + auditbeat/Dockerfile | 2 +- filebeat/Dockerfile | 2 +- heartbeat/Dockerfile | 2 +- journalbeat/Dockerfile | 2 +- libbeat/Dockerfile | 2 +- libbeat/docs/version.asciidoc | 2 +- metricbeat/Dockerfile | 2 +- metricbeat/module/http/_meta/Dockerfile | 2 +- packetbeat/Dockerfile | 2 +- x-pack/functionbeat/Dockerfile | 2 +- x-pack/libbeat/Dockerfile | 2 +- 13 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.go-version b/.go-version index 98e863cdf81..30a88ea45a4 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.15.8 +1.15.9 diff --git a/CHANGELOG-developer.next.asciidoc b/CHANGELOG-developer.next.asciidoc index 920125d9d56..55c44b49f4b 100644 --- a/CHANGELOG-developer.next.asciidoc +++ b/CHANGELOG-developer.next.asciidoc @@ -102,3 +102,4 @@ The list below covers the major changes between 7.0.0-rc2 and master only. - Update Go version to 1.15.7. {pull}22495[22495] - Update Go version to 1.15.8. {pull}23955[23955] +- Update Go version to 1.15.9. {pull}24442[24442] diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index 98c459dc4f4..4435e1aa944 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 RUN \ apt-get update \ diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile index 3750939e8ce..27c59548eb2 100644 --- a/filebeat/Dockerfile +++ b/filebeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 RUN \ apt-get update \ diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index ed2c4d10918..0f6bdf7b3a3 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 RUN \ apt-get update \ diff --git a/journalbeat/Dockerfile b/journalbeat/Dockerfile index 096b2ec1e79..da708d84a56 100644 --- a/journalbeat/Dockerfile +++ b/journalbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 RUN \ apt-get update \ diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile index 6c99894603c..b762849968f 100644 --- a/libbeat/Dockerfile +++ b/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index fb64906d947..4b1518006e9 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,6 @@ :stack-version: 7.12.0 :doc-branch: 7.x -:go-version: 1.15.8 +:go-version: 1.15.9 :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index 067bc00950c..b22eab4b436 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 RUN \ apt-get update \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 64d1de65fe0..07d81b3c5b9 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 COPY test/main.go main.go diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index f48ccaadd29..416f99f900d 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 53950aa33b6..3aa5e4bf820 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 RUN \ apt-get update \ diff --git a/x-pack/libbeat/Dockerfile b/x-pack/libbeat/Dockerfile index 935a38c8365..0c51c2ea88f 100644 --- a/x-pack/libbeat/Dockerfile +++ b/x-pack/libbeat/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.15.8 +FROM golang:1.15.9 RUN \ apt-get update \ From 988179fb07e91e5a40acd6b41577f3e1c80afdf5 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 18 Mar 2021 14:51:52 +0000 Subject: [PATCH 2/2] [CI] Add resilience when installing required tooling (#24542) (#24583) --- .ci/scripts/install-tools.bat | 3 +++ Jenkinsfile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.ci/scripts/install-tools.bat b/.ci/scripts/install-tools.bat index 1d29b548318..6f2acccb84c 100755 --- a/.ci/scripts/install-tools.bat +++ b/.ci/scripts/install-tools.bat @@ -20,6 +20,7 @@ IF EXIST "%PROGRAMFILES(X86)%" ( curl -L -o %WORKSPACE%\bin\gvm.exe https://github.com/andrewkroh/gvm/releases/download/v0.2.4/gvm-windows-amd64.exe IF ERRORLEVEL 1 ( REM gvm installation has failed. + del bin\gvm.exe /s /f /q exit /b 1 ) ) ELSE ( @@ -27,6 +28,7 @@ IF EXIST "%PROGRAMFILES(X86)%" ( curl -L -o %WORKSPACE%\bin\gvm.exe https://github.com/andrewkroh/gvm/releases/download/v0.2.4/gvm-windows-386.exe IF ERRORLEVEL 1 ( REM gvm installation has failed. + del bin\gvm.exe /s /f /q exit /b 1 ) ) @@ -44,6 +46,7 @@ FOR /f "tokens=*" %%i IN ('"%GVM_BIN%" use %GO_VERSION% --format=batch') DO %%i go env IF ERRORLEVEL 1 ( REM go is not configured correctly. + rmdir %WORKSPACE%\.gvm /s /q exit /b 1 ) diff --git a/Jenkinsfile b/Jenkinsfile index 302b5d5eca9..49398c4191e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -665,7 +665,7 @@ def installTools(args) { git config --global user.name "beatsmachine" fi''') } else { - retryWithSleep(retries: 2, seconds: 5, backoff: true){ bat(label: "${stepHeader} - Install Go/Mage/Python ${GO_VERSION}", script: ".ci/scripts/install-tools.bat") } + retryWithSleep(retries: 3, seconds: 5, backoff: true){ bat(label: "${stepHeader} - Install Go/Mage/Python ${GO_VERSION}", script: ".ci/scripts/install-tools.bat") } } }