From 1e50425d582148cb13ed62c2b73d1c752e546bcc Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 14 Aug 2020 13:58:13 +0200
Subject: Stop compiling K8s testing binaries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It reaches Travis CI timeouts and is quite useless.
PyNaCl is now installed via Alpine packages to save CI.

Change-Id: Ifdf3f46f162a811ed95e3ca07ea7c3d89bc77a91
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 6801612e85c485e9885cfb41cbc84771475a134f)
---
 .travis.yml                   | 28 ++++++++++++++++++++++++++--
 docker/healthcheck/Dockerfile | 27 +++++++++++----------------
 2 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fca1b2d8..829e9d3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,6 +55,18 @@ jobs:
         - amd64_dirs="docker/healthcheck"
         - arm_dirs=""
         - arm64_dirs=""
+    - script: bash build.sh
+      env:
+        - REPO="${DOCKER_USERNAME}"
+        - amd64_dirs=""
+        - arm_dirs="docker/healthcheck"
+        - arm64_dirs=""
+    - script: bash build.sh
+      env:
+        - REPO="${DOCKER_USERNAME}"
+        - amd64_dirs=""
+        - arm_dirs=""
+        - arm64_dirs="docker/healthcheck"
     - script: bash build.sh
       env:
         - REPO="${DOCKER_USERNAME}"
@@ -94,7 +106,7 @@ jobs:
     - stage: publish functest-kubernetes-[healthcheck,cnf,security] manifests
       script: >
         manifest-tool push from-args \
-          --platforms linux/amd64 \
+          --platforms linux/amd64,linux/arm,linux/arm64 \
           --template \
           ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-hunter \
           --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:hunter
@@ -116,9 +128,21 @@ jobs:
         - amd64_dirs="docker/smoke"
         - arm_dirs=""
         - arm64_dirs=""
+    - script: bash build.sh
+      env:
+        - REPO="${DOCKER_USERNAME}"
+        - amd64_dirs=""
+        - arm_dirs="docker/smoke"
+        - arm64_dirs=""
+    - script: bash build.sh
+      env:
+        - REPO="${DOCKER_USERNAME}"
+        - amd64_dirs=""
+        - arm_dirs=""
+        - arm64_dirs="docker/smoke"
     - stage: publish functest-kubernetes-smoke manifests
       script: >
         manifest-tool push from-args \
-          --platforms linux/amd64 \
+          --platforms linux/amd64,linux/arm,linux/arm64 \
           --template ${DOCKER_USERNAME}/functest-kubernetes-smoke:ARCH-hunter \
           --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:hunter
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 24ea959d..7bd00e56 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,20 +1,15 @@
 FROM opnfv/functest-kubernetes-core:hunter
 
-ARG K8S_TAG=v1.13.12
-
-RUN apk --no-cache add --update make py-pip bash git \
-        grep rsync linux-headers musl-dev findutils \
-        libffi openssl libjpeg-turbo && \
-    apk --no-cache add --virtual .build-deps --update \
-        gcc python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \
-    git init /src/k8s.io/kubernetes && \
-    (cd /src/k8s.io/kubernetes && \
-        git fetch --tags https://github.com/kubernetes/kubernetes $K8S_TAG && \
-        git checkout FETCH_HEAD && \
-        make kubectl ginkgo && \
-        make WHAT=test/e2e/e2e.test && \
-        mv _output/bin/* /usr/local/bin) && \
-    rm -r /src/k8s.io && \
-    apk del .build-deps
+RUN apk --no-cache add --update curl libc6-compat && \
+    K8S_TAG=$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable-1.13.txt)  && \
+    case $(uname -m) in armv7l) ARCH=arm;; aarch64) ARCH=arm;; x86_64) ARCH=amd64;; esac && \
+    curl https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG/bin/linux/$ARCH/kubectl \
+        -s --output /usr/local/bin/kubectl && \
+    curl https://storage.googleapis.com/kubernetes-release/release/$K8S_TAG/kubernetes-test-linux-$ARCH.tar.gz \
+        -s --output /src/kubernetes-test-linux-$ARCH.tar.gz && \
+    tar zxf /src/kubernetes-test-linux-$ARCH.tar.gz kubernetes/test/bin/e2e.test kubernetes/test/bin/ginkgo -C /src && \
+    mv /src/kubernetes/test/bin/e2e.test /src/kubernetes/test/bin/ginkgo /usr/local/bin/ && \
+    chmod +x /usr/local/bin/kubectl /usr/local/bin/e2e.test /usr/local/bin/ginkgo && \
+    rm -r /src/kubernetes /src/kubernetes-test-linux-$ARCH.tar.gz
 COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]
-- 
cgit 1.2.3-korg