aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml100
-rw-r--r--build.sh24
-rw-r--r--docker/healthcheck/Dockerfile4
3 files changed, 106 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml
index a8894d47..829e9d3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,76 +9,140 @@ addons:
- libssl1.0.0
before_script:
+ - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
- sudo add-apt-repository -y ppa:deadsnakes/ppa
- sudo apt-get update
- sudo apt-get install python3.6 python3.6-dev
- sudo pip install tox
- - sudo -E docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}"
+ - docker login -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}"
- (cd .. && git clone https://github.com/estesp/manifest-tool)
- (cd ../manifest-tool && git checkout v0.9.0)
- - (cd ../manifest-tool && sudo -E make && sudo -E make install)
+ - (cd ../manifest-tool && make && sudo make install)
jobs:
include:
- stage: run unit tests
script: tox -e pep8,pylint,yamllint,ansiblelint,bashate,py27,py36,bandit
- - stage: build functest-kubernetes-core image
- script: sudo -E bash build.sh
+ - stage: build functest-kubernetes-core images
+ script: bash build.sh
env:
- REPO="${DOCKER_USERNAME}"
- amd64_dirs="docker/core"
+ - arm_dirs=""
- arm64_dirs=""
+ - script: bash build.sh
+ env:
+ - REPO="${DOCKER_USERNAME}"
+ - amd64_dirs=""
+ - arm_dirs="docker/core"
+ - arm64_dirs=""
+ - script: bash build.sh
+ env:
+ - REPO="${DOCKER_USERNAME}"
+ - amd64_dirs=""
+ - arm_dirs=""
+ - arm64_dirs="docker/core"
- stage: publish functest-kubernetes-core manifests
script: >
- sudo manifest-tool push from-args \
- --platforms linux/amd64 \
+ manifest-tool push from-args \
+ --platforms linux/amd64,linux/arm,linux/arm64 \
--template ${DOCKER_USERNAME}/functest-kubernetes-core:ARCH-hunter \
--target ${DOCKER_USERNAME}/functest-kubernetes-core:hunter
- stage: build functest-kubernetes-[healthcheck,cnf,security] images
- script: sudo -E bash build.sh
+ script: bash build.sh
env:
- REPO="${DOCKER_USERNAME}"
- amd64_dirs="docker/healthcheck"
+ - arm_dirs=""
- arm64_dirs=""
- - script: sudo -E bash build.sh
+ - 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}"
- amd64_dirs="docker/cnf"
+ - arm_dirs=""
- arm64_dirs=""
+ - script: bash build.sh
+ env:
+ - REPO="${DOCKER_USERNAME}"
+ - amd64_dirs=""
+ - arm_dirs="docker/cnf"
+ - arm64_dirs=""
+ - script: bash build.sh
+ env:
+ - REPO="${DOCKER_USERNAME}"
+ - amd64_dirs=""
- arm_dirs=""
- - script: sudo -E bash build.sh
+ - arm64_dirs="docker/cnf"
+ - script: bash build.sh
env:
- REPO="${DOCKER_USERNAME}"
- amd64_dirs="docker/security"
+ - arm_dirs=""
- arm64_dirs=""
+ - script: bash build.sh
+ env:
+ - REPO="${DOCKER_USERNAME}"
+ - amd64_dirs=""
+ - arm_dirs="docker/security"
+ - arm64_dirs=""
+ - script: bash build.sh
+ env:
+ - REPO="${DOCKER_USERNAME}"
+ - amd64_dirs=""
- arm_dirs=""
+ - arm64_dirs="docker/security"
- stage: publish functest-kubernetes-[healthcheck,cnf,security] manifests
script: >
- sudo manifest-tool push from-args \
- --platforms linux/amd64 \
+ manifest-tool push from-args \
+ --platforms linux/amd64,linux/arm,linux/arm64 \
--template \
${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-hunter \
--target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:hunter
- script: >
- sudo manifest-tool push from-args \
- --platforms linux/amd64 \
+ manifest-tool push from-args \
+ --platforms linux/amd64,linux/arm,linux/arm64 \
--template ${DOCKER_USERNAME}/functest-kubernetes-cnf:ARCH-hunter \
--target ${DOCKER_USERNAME}/functest-kubernetes-cnf:hunter
- script: >
- sudo manifest-tool push from-args \
- --platforms linux/amd64 \
+ manifest-tool push from-args \
+ --platforms linux/amd64,linux/arm,linux/arm64 \
--template \
${DOCKER_USERNAME}/functest-kubernetes-security:ARCH-hunter \
--target ${DOCKER_USERNAME}/functest-kubernetes-security:hunter
- stage: build functest-kubernetes-smoke image
- script: sudo -E bash build.sh
+ script: bash build.sh
env:
- REPO="${DOCKER_USERNAME}"
- 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: >
- sudo manifest-tool push from-args \
- --platforms linux/amd64 \
+ manifest-tool push from-args \
+ --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/build.sh b/build.sh
index c9ee4045..1e92b65a 100644
--- a/build.sh
+++ b/build.sh
@@ -8,8 +8,7 @@ docker/core \
docker/healthcheck \
docker/smoke \
docker/cnf \
-docker/security \
-docker/features"}
+docker/security"}
arm64_dirs=${arm64_dirs-${amd64_dirs}}
build_opts=(--pull=true --no-cache --force-rm=true)
@@ -55,4 +54,25 @@ done
arm64v8/golang:1.11-alpine3.9 || true)
find . -name Dockerfile -exec git checkout {} +
+find . -name Dockerfile -exec sed -i \
+ -e "s|golang:1.14-alpine3.12|arm32v7/golang:1.14-alpine3.12|g" {} +
+find . -name Dockerfile -exec sed -i \
+ -e "s|opnfv/functest-kubernetes-core|\
+${repo}/functest-kubernetes-core:arm-hunter|g" {} +
+find . -name Dockerfile -exec sed -i \
+ -e "s|opnfv/functest-kubernetes-healthcheck|\
+${repo}/functest-kubernetes-healthcheck:arm-hunter|g" {} +
+for dir in ${arm_dirs}; do
+ (cd "${dir}" && docker build "${build_opts[@]}" \
+ -t "${repo}/functest-kubernetes-${dir##**/}:arm-hunter" .)
+ docker push "${repo}/functest-kubernetes-${dir##**/}:arm-hunter"
+ [ "${dir}" != "docker/core" ] &&
+ (docker rmi \
+ "${repo}/functest-kubernetes-${dir##**/}:arm-hunter" || true)
+done
+[ ! -z "${arm_dirs}" ] &&
+ (docker rmi "${repo}/functest-kubernetes-core:arm-hunter" \
+ arm32v7/golang:1.14-alpine3.12 || true)
+find . -name Dockerfile -exec git checkout {} +
+
exit $?
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 24ea959d..943fb662 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -11,8 +11,8 @@ RUN apk --no-cache add --update make py-pip bash git \
(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 && \
+ make kubectl ginkgo GOFLAGS=-v && \
+ make WHAT=test/e2e/e2e.test GOFLAGS=-v && \
mv _output/bin/* /usr/local/bin) && \
rm -r /src/k8s.io && \
apk del .build-deps