diff options
| -rw-r--r-- | .travis.yml | 28 | ||||
| -rw-r--r-- | ansible/site.yml | 4 | ||||
| -rw-r--r-- | build.sh | 10 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 27 |
5 files changed, 26 insertions, 45 deletions
diff --git a/.travis.yml b/.travis.yml index 829e9d3f..fca1b2d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,18 +58,6 @@ jobs: - 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="" @@ -106,7 +94,7 @@ jobs: - stage: publish functest-kubernetes-[healthcheck,cnf,security] manifests script: > manifest-tool push from-args \ - --platforms linux/amd64,linux/arm,linux/arm64 \ + --platforms linux/amd64 \ --template \ ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-hunter \ --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:hunter @@ -128,21 +116,9 @@ 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,linux/arm,linux/arm64 \ + --platforms linux/amd64 \ --template ${DOCKER_USERNAME}/functest-kubernetes-smoke:ARCH-hunter \ --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:hunter diff --git a/ansible/site.yml b/ansible/site.yml index 306d39d4..33b74546 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -12,8 +12,8 @@ dependencies: - repo: _ dport: - container: alpine - tag: 3.9 + container: golang + tag: 1.11-alpine3.9 steps: - name: build opnfv/functest-kubernetes-core containers: @@ -30,11 +30,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-hunter" \ - alpine:3.9 || true) + golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.9|arm64v8/alpine:3.9|g" {} + + -e "s|golang:1.11-alpine3.9|arm64v8/golang:1.11-alpine3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm64-hunter|g" {} + @@ -51,11 +51,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \ - arm64v8/alpine:3.9 || true) + arm64v8/golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.9|arm32v7/alpine:3.9|g" {} + + -e "s|golang:1.11-alpine3.9|arm32v7/golang:1.11-alpine3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm-hunter|g" {} + @@ -72,7 +72,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-hunter" \ - arm32v7/alpine:3.9 || true) + arm32v7/golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index bb917175..069255ed 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.9 +FROM golang:1.11-alpine3.9 ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index c4e5f3b1..24ea959d 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,15 +1,20 @@ FROM opnfv/functest-kubernetes-core:hunter -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=arm64;; 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 +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 COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] |