Update golang to 1.15.5

Jenkinsfile

@@ -2,7 +2,7 @@
 @Library('apm@current') _
 
 pipeline {
-  agent { label 'ubuntu && immutable' }
+  agent { label 'ubuntu-20 && immutable' }
   environment {
     REPO = 'golang-crossbuild'
     BASE_DIR = "src/github.com/elastic/${env.REPO}"
@@ -12,7 +12,7 @@ pipeline {
     DOCKER_REGISTRY_SECRET = 'secret/observability-team/ci/docker-registry/prod'
     REGISTRY = 'docker.elastic.co'
     STAGING_IMAGE = "${env.REGISTRY}/observability-ci"
-    GO_VERSION = '1.14.2'
+    GO_VERSION = '1.15.6'
   }
   options {
     timeout(time: 2, unit: 'HOURS')
@@ -25,7 +25,7 @@ pipeline {
     quietPeriod(10)
   }
   triggers {
-    issueCommentTrigger('(?i).*jenkins\\W+run\\W+(?:the\\W+)?tests(?:\\W+please)?.*')
+    issueCommentTrigger('(?i)(.*jenkins\\W+run\\W+(?:the\\W+)?tests(?:\\W+please)?.*|/test)')
   }
   stages {
     stage('Checkout') {
@@ -35,37 +35,50 @@ pipeline {
         stash name: 'source', useDefaultExcludes: false
       }
     }
-    stage('Build') {
-      steps {
-        withGithubNotify(context: 'Build') {
-          deleteDir()
-          unstash 'source'
-          buildImages()
-        }
-      }
-    }
-    stage('Staging') {
-      environment {
-        REPOSITORY = "${env.STAGING_IMAGE}"
-      }
-      steps {
-        withGithubNotify(context: 'Staging') {
-          // It will use the already cached docker images that were created in the
-          // Build stage. But it's required to retag them with the staging repo.
-          buildImages()
-          publishImages()
+    stage('Package'){
+      matrix {
+        agent { label 'ubuntu-20 && immutable' }
+        axes {
+          axis {
+            name "MAKEFILE"
+            values 'Makefile', 'Makefile.debian7', 'Makefile.debian8', 'Makefile.debian9', 'Makefile.debian10'
+          }
+          axis {
+            name 'GO_FOLDER'
+            values 'go1.14', 'go1.15'
+          }
         }
-      }
-    }
-    stage('Release') {
-      when {
-        branch 'master'
-      }
-      stages {
-        stage('Publish') {
-          steps {
-            withGithubNotify(context: 'Publish') {
-              publishImages()
+        stages {
+          stage('Build') {
+            steps {
+              withGithubNotify(context: "Build ${GO_FOLDER} ${MAKEFILE}") {
+                deleteDir()
+                unstash 'source'
+                buildImages()
+              }
+            }
+          }
+          stage('Staging') {
+            environment {
+              REPOSITORY = "${env.STAGING_IMAGE}"
+            }
+            steps {
+              withGithubNotify(context: "Staging ${GO_FOLDER} ${MAKEFILE}") {
+                // It will use the already cached docker images that were created in the
+                // Build stage. But it's required to retag them with the staging repo.
+                buildImages()
+                publishImages()
+              }
+            }
+          }
+          stage('Release') {
+            when {
+              branch 'master'
+            }
+            steps {
+              withGithubNotify(context: "Release ${GO_FOLDER} ${MAKEFILE}") {
+                publishImages()
+              }
             }
           }
         }
@@ -82,14 +95,14 @@ pipeline {
 def buildImages(){
   withGoEnv(){
     dir("${env.BASE_DIR}"){
-      sh 'make build'
+      sh "make -C ${GO_FOLDER} -f ${MAKEFILE} build"
     }
   }
 }
 
 def publishImages(){
   dockerLogin(secret: "${env.DOCKER_REGISTRY_SECRET}", registry: "${env.REGISTRY}")
   dir("${env.BASE_DIR}"){
-    sh(label: "push docker image to ${env.REPOSITORY}", script: 'make push')
+    sh(label: "push docker image to ${env.REPOSITORY}", script: "make -C ${GO_FOLDER} -f ${MAKEFILE} push")
   }
 }

Makefile

@@ -1,13 +1,14 @@
-TARGETS=go1.10 go1.11 go1.12 go1.13 go1.14
+TARGETS=go1.10 go1.11 go1.12 go1.13 go1.14 go1.15
 
 build: status=".status.build"
 build:
 	@echo '0' > ${status}
 	@$(foreach var,$(TARGETS), \
-		$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
-		$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
-		$(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status}; \
-		$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status};)
+		$(MAKE) -C $(var) $@; || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian7 $@; || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian8 $@; || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian9 $@; || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian10 $@; || echo '1' > ${status};)
 	@make -C fpm $@ || echo '1' > ${status}
 	exit $$(cat ${status})
 
@@ -19,7 +20,8 @@ push:
 		$(MAKE) -C $(var) $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian7 $@ || echo '1' > ${status}; \
 		$(MAKE) -C $(var) -f Makefile.debian8 $@ || echo '1' > ${status}; \
-		$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status};)
+		$(MAKE) -C $(var) -f Makefile.debian9 $@ || echo '1' > ${status}; \
+		$(MAKE) -C $(var) -f Makefile.debian10 $@ || echo '1' > ${status};)
 	@make -C fpm $@ || echo '1' > ${status}
 	exit $$(cat ${status})
 

README.md

@@ -14,17 +14,20 @@ The base image used is Debian 9 (stretch) unless otherwise specified.
 
 ## Build Tags
 
-- `1.10.8-main`, `1.11.13-main`, `1.12.12-main`, `1.13.12-main`, `1.14.7` - linux/{amd64,386} and windows/{amd64,386}
-- `1.10.8-arm`, `1.11.13-arm`, `1.12.12-arm`, `1.13.12-arm`, `1.14.7` - linux/{armv5,armv6,armv7,arm64}
-- `1.10.8-darwin`, `1.11.13-darwin`, `1.12.12-darwin`, `1.13.12-darwin`, `1.14.7` - darwin/{amd64,386}
-- `1.10.8-ppc`, `1.11.13-ppc`, `1.12.12-ppc`, `1.13.12-ppc`, `1.14.7` - linux/{ppc64,ppc64le}
-- `1.10.8-mips`, `1.11.13-mips`, `1.12.12-mips`, `1.13.12-mips`, `1.14.7` - linux/{mips,mipsle,mips64,mips64le}
-- `1.10.8-s390x`, `1.11.13-s390x`, `1.12.12-s390`, `1.13.12-s390`, `1.14.7` - linux/s390x
-- `1.10.8-main-debian7`, `1.11.13-main-debian7`, `1.12.12-debian7`, `1.13.12-debian7`, `1.14.7` - linux/{amd64,386} and windows/{amd64,386} (Debian 7
+- `1.10.8-main`, `1.11.13-main`, `1.12.12-main`, `1.13.12-main`, `1.14.12-main`, `1.15.6-main` - linux/{amd64,386} and windows/{amd64,386}
+- `1.10.8-arm`, `1.11.13-arm`, `1.12.12-arm`, `1.13.12-arm`, `1.14.12-arm`, `1.15.6-arm` - linux/{armv5,armv6,armv7,arm64}
+- `1.10.8-darwin`, `1.11.13-darwin`, `1.12.12-darwin`, `1.13.12-darwin`, `1.14.12-darwin` - darwin/{386}
+- `1.10.8-darwin`, `1.11.13-darwin`, `1.12.12-darwin`, `1.13.12-darwin`, `1.14.12-darwin`, `1.15.6-darwin` - darwin/{amd64}
+- `1.10.8-ppc`, `1.11.13-ppc`, `1.12.12-ppc`, `1.13.12-ppc`, `1.14.12-ppc`, `1.15.6-ppc` - linux/{ppc64,ppc64le}
+- `1.10.8-mips`, `1.11.13-mips`, `1.12.12-mips`, `1.13.12-mips`, `1.14.12-mips`, `1.15.6-mips` - linux/{mips,mipsle,mips64,mips64le}
+- `1.10.8-s390x`, `1.11.13-s390x`, `1.12.12-s390`, `1.13.12-s390`, `1.14.12-s390`, `1.15.6-s390` - linux/s390x
+- `1.10.8-main-debian7`, `1.11.13-main-debian7`, `1.12.12-debian7`, `1.13.12-debian7`, `1.14.12-debian7`, `1.15.6-debian7` - linux/{amd64,386} and windows/{amd64,386} (Debian 7
   uses glibc 2.13 so the resulting binaries (if dynamically linked) have greater
   compatibility.)
-- `1.10.8-main-debian8`, `1.11.13-main-debian8`, `1.12.12-main-debian8`, `1.13.12-debian8`, `1.14.7` - linux/{amd64,386} and windows/{amd64,386} (Debian 8
+- `1.10.8-main-debian8`, `1.11.13-main-debian8`, `1.12.12-main-debian8`, `1.13.12-debian8`, `1.14.12-debian8`, `1.15.6-debian8` - linux/{amd64,386} and windows/{amd64,386} (Debian 8
   uses glibc 2.19)
+- `1.15.6-debian9` - linux/{amd64,386} and windows/{amd64,386} (Debian 9 uses glibc 2.24)
+- `1.15.6-debian10` - linux/{amd64,386} and windows/{amd64,386} (Debian 10 uses glibc 2.28)
 
 ## Usage Example
 

go1.14/Makefile.debian10

@@ -0,0 +1,14 @@
+IMAGES         := base main darwin
+DEBIAN_VERSION := 10
+TAG_EXTENSION  := -debian10
+
+export DEBIAN_VERSION TAG_EXTENSION
+
+build:
+	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)
+
+# Requires login at https://docker.elastic.co:7000/.
+push:
+	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) push || exit 1;)
+
+.PHONY: build push

go1.14/Makefile.debian8

@@ -1,10 +1,11 @@
-IMAGES         := base main
+IMAGES         :=  base main darwin
 DEBIAN_VERSION := 8
 TAG_EXTENSION  := -debian8
 
 export DEBIAN_VERSION TAG_EXTENSION
 
 build:
+	export |grep TAG_EXTENSION
 	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)
 
 # Requires login at https://docker.elastic.co:7000/.

go1.14/Makefile.debian9

@@ -1,4 +1,4 @@
-IMAGES         := base main
+IMAGES         := base main arm darwin mips ppc s390x
 DEBIAN_VERSION := 9
 TAG_EXTENSION  := -debian9
 

go1.14/arm/Dockerfile.tmpl

@@ -1,11 +1,10 @@
 ARG REPOSITORY
 ARG VERSION
-FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base
+ARG TAG_EXTENSION=''
+FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
 
 RUN \
     dpkg --add-architecture arm64 \
-#    && dpkg --add-architecture armhf \
-#    && dpkg --add-architecture armel \
     && apt-get update -qq \
     && apt-get install -qq -y \
       --no-install-recommends \
@@ -26,30 +25,25 @@ RUN \
         libicu57:arm64 \
         icu-devtools:arm64 \
         libsystemd-dev:arm64 \
-#        librpm-dev:armhf \
-#        libc-dev:armhf \
-#        libpopt-dev:armhf \
-#        linux-libc-dev:armhf \
-#        libxml2-dev:armhf \
-#        libxml2:armhf \
-#        libicu-dev:armhf \
-#        libicu57:armhf \
-#        icu-devtools:armhf \
-#        libsystemd-dev:armhf \
-#        librpm-dev:armel \
-#        libc-dev:armel \
-#        libpopt-dev:armel \
-#        linux-libc-dev:armel \
-#        libxml2-dev:armel \
-#        libxml2:armel \
-#        libicu-dev:armel \
-#        libicu57:armel \
-#        icu-devtools:armel \
-#        libsystemd-dev:armel \
+        librpm3:arm64  \
+        librpmio3:arm64 \
+        librpmbuild3:arm64 \
+        librpmsign3:arm64 \
+        libsqlite3-dev:arm64 \
+        libnss3:arm64 \
+        libsqlite3-0:arm64 \
     && rm -rf /var/lib/apt/lists/*
 
 COPY rootfs /
 
+# Basic test
+RUN cd / \
+  && aarch64-linux-gnu-gcc helloWorld.c -o helloWorld \
+  && file helloWorld \
+  && readelf -h helloWorld \
+  && file helloWorld | cut -d "," -f 2 | grep -c 'ARM aarch64'\
+  && rm helloWorld.c helloWorld
+
 # Build-time metadata as defined at http://label-schema.org.
 ARG BUILD_DATE
 ARG IMAGE

go1.14/arm/rootfs/helloWorld.c

@@ -0,0 +1,5 @@
+#include <stdio.h>
+int main() {
+   printf("Hello, World!");
+   return 0;
+}

go1.14/base/Dockerfile.tmpl

@@ -1,14 +1,12 @@
 ARG DEBIAN_VERSION
 FROM debian:${DEBIAN_VERSION}
 
-{{if or (eq .DEBIAN_VERSION "7") (eq .DEBIAN_VERSION "8") -}}
+ARG DEBIAN_VERSION
 # Replace sources.list in order to use archive.debian.org.
-COPY sources-debian{{.DEBIAN_VERSION}}.list /etc/apt/sources.list
-{{- end}}
+COPY sources-debian${DEBIAN_VERSION}.list /etc/apt/sources.list
 
 RUN \
     apt-get -o Acquire::Check-Valid-Until=false update \
-        && apt-get dist-upgrade -y \
         && apt-get install -y --no-install-recommends --allow-unauthenticated \
             build-essential \
             ca-certificates \

go1.14/base/sources-debian10.list

@@ -0,0 +1,2 @@
+deb http://deb.debian.org/debian buster main
+deb [arch=amd64,i386] http://security.debian.org/debian-security buster/updates main

go1.14/base/sources-debian8.list

@@ -1,2 +1,2 @@
 deb http://archive.debian.org/debian jessie main
-deb http://security.debian.org/debian-security jessie/updates main
+deb [arch=amd64,i386] http://security.debian.org/debian-security jessie/updates main

go1.14/base/sources-debian9.list

@@ -0,0 +1,2 @@
+deb http://deb.debian.org/debian stretch main
+deb [arch=amd64,i386] http://security.debian.org/debian-security stretch/updates main

go1.14/darwin/Dockerfile.tmpl

@@ -1,9 +1,11 @@
 ARG REPOSITORY
 ARG VERSION
-FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base
+ARG TAG_EXTENSION=''
+FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
 
 RUN \
-    apt-get update && apt-get install -y --no-install-recommends --allow-unauthenticated \
+    apt-get -o Acquire::Check-Valid-Until=false update \
+    && apt-get install -y --no-install-recommends --allow-unauthenticated \
         clang \
         llvm \
     && rm -rf /var/lib/apt/lists/*
@@ -28,6 +30,18 @@ ENV PATH $OSXCROSS_PATH/bin:$PATH
 
 COPY rootfs /
 
+# Basic test
+RUN cd / \
+  && o64-clang helloWorld.c -o helloWorld \
+  && file helloWorld \
+  && file helloWorld | grep -c 'Mach-O 64-bit x86_64'
+
+RUN cd / \
+  && o32-clang helloWorld.c -o helloWorld \
+  && file helloWorld \
+  && file helloWorld | grep -c 'Mach-O i386' \
+  && rm helloWorld.c helloWorld
+
 # Build-time metadata as defined at http://label-schema.org.
 ARG BUILD_DATE
 ARG IMAGE

go1.14/darwin/rootfs/helloWorld.c

@@ -0,0 +1,5 @@
+#include <stdio.h>
+int main() {
+   printf("Hello, World!");
+   return 0;
+}

go1.14/main/Dockerfile.tmpl

@@ -1,12 +1,12 @@
 ARG REPOSITORY
 ARG VERSION
-ARG TAG_EXTENSION=
+ARG TAG_EXTENSION=''
 FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
 
 RUN \
     dpkg --add-architecture i386 \
     && apt-get -o Acquire::Check-Valid-Until=false update \
-    && apt-get install -y --no-install-recommends --allow-unauthenticated \
+    && apt-get install -qq -y --no-install-recommends --allow-unauthenticated \
         clang \
         g++ \
         gcc \
@@ -22,6 +22,14 @@ RUN \
 
 COPY rootfs /
 
+# Basic test
+RUN cd / \
+  && gcc helloWorld.c -o helloWorld \
+  && file helloWorld \
+  && readelf -h helloWorld \
+  && file helloWorld | cut -d "," -f 2 | grep -c 'x86-64' \
+  && rm helloWorld.c helloWorld
+
 # Build-time metadata as defined at http://label-schema.org.
 ARG BUILD_DATE
 ARG IMAGE

go1.14/main/rootfs/helloWorld.c

@@ -0,0 +1,5 @@
+#include <stdio.h>
+int main() {
+   printf("Hello, World!");
+   return 0;
+}