From 5133eb519ea5cc94f2cd5d0f9e512bf5199a2276 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Wed, 26 May 2021 16:18:38 +0200
Subject: [PATCH 1/6] chore: remove compilers no available in main chore: set
 OSX_VERSION_MIN to 10.10 on SDK 10.14 chore: do not install python on Debian
 10 is installed

---
 go1.15/main/rootfs/compilers.yaml | 8 --------
 go1.16/darwin/Dockerfile.tmpl     | 4 +++-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/go1.15/main/rootfs/compilers.yaml b/go1.15/main/rootfs/compilers.yaml
index 02af3c42..1dd4b616 100644
--- a/go1.15/main/rootfs/compilers.yaml
+++ b/go1.15/main/rootfs/compilers.yaml
@@ -8,14 +8,6 @@ windows:
     CC:  x86_64-w64-mingw32-gcc
     CXX: x86_64-w64-mingw32-g++
 
-darwin:
-  386:
-    CC:  o32-clang
-    CXX: o32-clang++
-  amd64:
-    CC:  o64-clang
-    CXX: o64-clang++
-
 linux:
   386:
     CC:  gcc
diff --git a/go1.16/darwin/Dockerfile.tmpl b/go1.16/darwin/Dockerfile.tmpl
index 90dda583..976cf9b1 100644
--- a/go1.16/darwin/Dockerfile.tmpl
+++ b/go1.16/darwin/Dockerfile.tmpl
@@ -10,7 +10,9 @@ RUN \
         llvm \
         cmake \
         patch \
+{{if ne .DEBIAN_VERSION "10"}}
         python \
+{{ end }}
         libssl-dev \
         libxml2-dev \
         lzma-dev \
@@ -24,7 +26,7 @@ ARG OSXCROSS_PATH=/usr/osxcross
 ARG OSXCROSS_REV=8a716a43a72dab1db9630d7824ee0af3730cb8f9
 ARG SDK_VERSION=10.14
 ARG DARWIN_VERSION=17
-ARG OSX_VERSION_MIN=10.14
+ARG OSX_VERSION_MIN=10.10
 {{ else }}
 ARG OSXCROSS_SDK_URL=https://storage.googleapis.com/obs-ci-cache/beats/MacOSX10.11.sdk.tar.xz
 ARG OSXCROSS_PATH=/usr/osxcross

From 6a7d2caa458a75d07de6eabb93a6695308b9b9a1 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Wed, 26 May 2021 16:18:55 +0200
Subject: [PATCH 2/6] chore: increase timeout

---
 Jenkinsfile | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 02ad6721..0b64c5af 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
     GO_VERSION = '1.16.4'
   }
   options {
-    timeout(time: 3, unit: 'HOURS')
+    timeout(time: 6, unit: 'HOURS')
     buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
     timestamps()
     ansiColor('xterm')
@@ -53,16 +53,6 @@ pipeline {
           }
         }
         excludes {
-          exclude {
-            axis {
-              name 'PLATFORM'
-              values 'arm'
-            }
-            axis {
-              name 'GO_FOLDER'
-              values 'go1.14'
-            }
-          }
           exclude {
             axis {
               name 'PLATFORM'

From abfdf71db3ec241d4038e0dc6431133980abe72c Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Wed, 26 May 2021 16:19:33 +0200
Subject: [PATCH 3/6] feat: add suport for darwin/arm64

---
 go1.16/Makefile.debian10                  |  2 +-
 go1.16/darwin-arm64/Dockerfile.tmpl       | 66 +++++++++++++++++++++++
 go1.16/darwin-arm64/Makefile              |  1 +
 go1.16/darwin-arm64/rootfs/compilers.yaml |  9 ++++
 go1.16/darwin-arm64/rootfs/helloWorld.c   |  5 ++
 5 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 go1.16/darwin-arm64/Dockerfile.tmpl
 create mode 100644 go1.16/darwin-arm64/Makefile
 create mode 100644 go1.16/darwin-arm64/rootfs/compilers.yaml
 create mode 100644 go1.16/darwin-arm64/rootfs/helloWorld.c

diff --git a/go1.16/Makefile.debian10 b/go1.16/Makefile.debian10
index 479b70e7..5e1bd9fc 100644
--- a/go1.16/Makefile.debian10
+++ b/go1.16/Makefile.debian10
@@ -1,4 +1,4 @@
-IMAGES         := base arm armhf armel mips mips32 ppc s390x darwin main
+IMAGES         := base main darwin arm armhf armel mips mips32 ppc s390x darwin-arm64
 DEBIAN_VERSION := 10
 TAG_EXTENSION  := -debian10
 
diff --git a/go1.16/darwin-arm64/Dockerfile.tmpl b/go1.16/darwin-arm64/Dockerfile.tmpl
new file mode 100644
index 00000000..ac7e3b4b
--- /dev/null
+++ b/go1.16/darwin-arm64/Dockerfile.tmpl
@@ -0,0 +1,66 @@
+ARG REPOSITORY
+ARG VERSION
+ARG TAG_EXTENSION=''
+FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-base${TAG_EXTENSION}
+
+RUN \
+    apt-get -o Acquire::Check-Valid-Until=false update \
+    && apt-get install -qq -y --no-install-recommends --allow-unauthenticated \
+        cmake \
+        patch \
+        libssl-dev \
+        libxml2-dev \
+        lzma-dev \
+        uuid-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+{{if eq .DEBIAN_VERSION "10"}}
+ARG OSXCROSS_SDK_URL=https://storage.googleapis.com/obs-ci-cache/beats/MacOSX11.3.sdk.tar.xz
+ARG OSXCROSS_PATH=/usr/osxcross
+ARG OSXCROSS_REV=035cc170338b7b252e3f13b0e3ccbf4411bffc41
+ARG SDK_VERSION=11.3
+ARG DARWIN_VERSION=20
+ARG OSX_VERSION_MIN=11.3
+{{ else }}
+RUN echo "This Docker image will work only with Debian 10" && exit 1
+{{ end }}
+
+RUN \
+    mkdir -p /tmp/osxcross && cd /tmp/osxcross \
+    && curl -sSL "https://codeload.github.com/tpoechtrager/osxcross/tar.gz/${OSXCROSS_REV}" \
+        | tar -C /tmp/osxcross --strip=1 -xzf - \
+    && curl -sSLo "tarballs/MacOSX${SDK_VERSION}.sdk.tar.xz" "${OSXCROSS_SDK_URL}" \
+    && UNATTENDED=yes ENABLE_CLANG_INSTALL=yes ./build_clang.sh >/dev/null \
+    && UNATTENDED=yes ./build.sh >/dev/null \
+    && mv target "${OSXCROSS_PATH}" \
+    && rm -rf /tmp/osxcross "/usr/osxcross/SDK/MacOSX${SDK_VERSION}.sdk/usr/share/man"
+
+ENV PATH $OSXCROSS_PATH/bin:$PATH
+# Add osxcross libraries to the library PATH
+ENV LD_LIBRARY_PATH /usr/osxcross/lib:$LD_LIBRARY_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 / \
+  && oa64-clang helloWorld.c -o helloWorld \
+  && file helloWorld \
+  && file helloWorld | grep -c 'Mach-O 64-bit arm64' \
+  && rm helloWorld helloWorld.c
+
+
+# Build-time metadata as defined at http://label-schema.org.
+ARG BUILD_DATE
+ARG IMAGE
+ARG VCS_REF
+ARG VCS_URL
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name=$IMAGE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url=$VCS_URL \
+      org.label-schema.schema-version="1.0"
diff --git a/go1.16/darwin-arm64/Makefile b/go1.16/darwin-arm64/Makefile
new file mode 100644
index 00000000..0a42375f
--- /dev/null
+++ b/go1.16/darwin-arm64/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/go1.16/darwin-arm64/rootfs/compilers.yaml b/go1.16/darwin-arm64/rootfs/compilers.yaml
new file mode 100644
index 00000000..297670b4
--- /dev/null
+++ b/go1.16/darwin-arm64/rootfs/compilers.yaml
@@ -0,0 +1,9 @@
+---
+
+darwin:
+  amd64:
+    CC:  o64-clang
+    CXX: o64-clang++
+  arm64:
+    CC:  oa64-clang
+    CXX: oa64-clang++
diff --git a/go1.16/darwin-arm64/rootfs/helloWorld.c b/go1.16/darwin-arm64/rootfs/helloWorld.c
new file mode 100644
index 00000000..dcfb86bc
--- /dev/null
+++ b/go1.16/darwin-arm64/rootfs/helloWorld.c
@@ -0,0 +1,5 @@
+#include <stdio.h>
+int main() {
+   printf("Hello, World!");
+   return 0;
+}

From ad43d283baea6583fd6e752c585c1fe97827f644 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Wed, 26 May 2021 16:28:49 +0200
Subject: [PATCH 4/6] feat: list Docker images

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0b64c5af..1a33764b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -144,6 +144,7 @@ def buildImages(){
     dir("${env.BASE_DIR}"){
       def platform = (PLATFORM?.trim().equals('arm')) ? '-arm' : ''
       sh "make -C ${GO_FOLDER} -f ${MAKEFILE} build${platform}"
+      sh(label: 'list Docker images', script: 'docker images --format "table {{.Repository}}:{{.Tag}}\t{{.Size}}" --filter=reference="docker.elastic.co/beats-dev/golang-crossbuild"')
     }
   }
 }

From 7f636dfab481c24637fdb153de3f87a6399f839a Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@users.noreply.github.com>
Date: Thu, 27 May 2021 10:38:04 +0200
Subject: [PATCH 5/6] Update Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1a33764b..7d56afc6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,7 +15,7 @@ pipeline {
     GO_VERSION = '1.16.4'
   }
   options {
-    timeout(time: 6, unit: 'HOURS')
+    timeout(time: 3, unit: 'HOURS')
     buildDiscarder(logRotator(numToKeepStr: '20', artifactNumToKeepStr: '20', daysToKeepStr: '30'))
     timestamps()
     ansiColor('xterm')

From 238f821eff8024e7567330c8487397c0833271b3 Mon Sep 17 00:00:00 2001
From: Ivan Fernandez Calvo <kuisathaverat@yahoo.com>
Date: Thu, 27 May 2021 11:15:52 +0200
Subject: [PATCH 6/6] fix: resilience against environmental issues

---
 Jenkinsfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1a33764b..64bfedc0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -143,7 +143,9 @@ def buildImages(){
   withGoEnv(){
     dir("${env.BASE_DIR}"){
       def platform = (PLATFORM?.trim().equals('arm')) ? '-arm' : ''
-      sh "make -C ${GO_FOLDER} -f ${MAKEFILE} build${platform}"
+      retryWithSleep(retries: 3, seconds: 15, backoff: true) {
+        sh "make -C ${GO_FOLDER} -f ${MAKEFILE} build${platform}"
+      }
       sh(label: 'list Docker images', script: 'docker images --format "table {{.Repository}}:{{.Tag}}\t{{.Size}}" --filter=reference="docker.elastic.co/beats-dev/golang-crossbuild"')
     }
   }
@@ -154,6 +156,8 @@ def publishImages(){
   dockerLogin(secret: "${env.DOCKER_REGISTRY_SECRET}", registry: "${env.REGISTRY}")
   dir("${env.BASE_DIR}"){
     def platform = (PLATFORM?.trim().equals('arm')) ? '-arm' : ''
-    sh(label: "push docker image to ${env.REPOSITORY}", script: "make -C ${GO_FOLDER} -f ${MAKEFILE} push${platform}")
+    retryWithSleep(retries: 3, seconds: 15, backoff: true) {
+      sh(label: "push docker image to ${env.REPOSITORY}", script: "make -C ${GO_FOLDER} -f ${MAKEFILE} push${platform}")
+    }
   }
 }