github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #429 from erikwilson/e2e-testing-fix 

Fix e2e testing on publish
pull/432/head v0.5.0-rc3
Darren Shepherd 2019-05-02 13:14:56 -07:00 committed by GitHub
parent 4ec051d032 3f849786de
commit 21a9dbe2fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.drone.yml
View File

@ -18,7 +18,7 @@ steps:
- name: sonobuoy-e2e-tests - name: sonobuoy-e2e-tests
image: rancher/dapper:v0.4.1 image: rancher/dapper:v0.4.1
commands: commands:
- dapper -f Dockerfile.sonobuoy.dapper sonobuoy-e2e-tests - dapper -f Dockerfile.sonobuoy.dapper
volumes: volumes:
- name: docker - name: docker
path: /var/run/docker.sock path: /var/run/docker.sock

3
Dockerfile.sonobuoy.dapper
View File

@ -15,6 +15,7 @@ RUN curl -sL https://storage.googleapis.com/kubernetes-release/release/$( \
chmod a+x /usr/local/bin/kubectl chmod a+x /usr/local/bin/kubectl
ENV DAPPER_RUN_ARGS --privileged --network host ENV DAPPER_RUN_ARGS --privileged --network host
ENV DAPPER_ENV REPO TAG DRONE_TAG IMAGE_NAME
ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/ ENV DAPPER_SOURCE /go/src/github.com/rancher/k3s/
ENV DAPPER_OUTPUT ./dist ENV DAPPER_OUTPUT ./dist
ENV DAPPER_DOCKER_SOCKET true ENV DAPPER_DOCKER_SOCKET true
@ -22,4 +23,4 @@ ENV HOME ${DAPPER_SOURCE}
WORKDIR ${DAPPER_SOURCE} WORKDIR ${DAPPER_SOURCE}
ENTRYPOINT ["./scripts/entry.sh"] ENTRYPOINT ["./scripts/entry.sh"]
CMD ["ci"] CMD ["sonobuoy-e2e-tests"]

10
scripts/sonobuoy
View File

@ -25,7 +25,7 @@ get-port() {
} }
export -f get-port export -f get-port
K3S_PORT=$(timeout 5s bash -c get-port) K3S_PORT=$(timeout --foreground 5s bash -c get-port)
OUTPUT=$(pwd)/sonobuoy-output/${K3S_PORT} OUTPUT=$(pwd)/sonobuoy-output/${K3S_PORT}
mkdir -p ${OUTPUT} mkdir -p ${OUTPUT}
@ -84,7 +84,7 @@ wait-for-kubeconfig() {
} }
export -f wait-for-kubeconfig export -f wait-for-kubeconfig
timeout 1m bash -c wait-for-kubeconfig timeout --foreground 1m bash -c wait-for-kubeconfig
# --- # ---
@ -104,7 +104,7 @@ wait-for-nodes() {
} }
export -f wait-for-nodes export -f wait-for-nodes
timeout 1m bash -c wait-for-nodes timeout --foreground 1m bash -c wait-for-nodes
# --- # ---
@ -125,13 +125,13 @@ wait-for-services() {
} }
export -f wait-for-services export -f wait-for-services
timeout 1m bash -c wait-for-services timeout --foreground 1m bash -c wait-for-services
# --- # ---
echo "Starting sonobuoy tests" echo "Starting sonobuoy tests"
timeout 30m sonobuoy run \ timeout --foreground 30m sonobuoy run \
--config scripts/sonobuoy-config.json \ --config scripts/sonobuoy-config.json \
--wait \ --wait \
${@} ${@}

13
scripts/sonobuoy-e2e-tests
View File

@ -1,14 +1,15 @@
#!/bin/bash #!/bin/bash
set -e -x set -e -x
source $(dirname $0)/version.sh
cd $(dirname $0)/.. cd $(dirname $0)/..
TAG=${TAG:-${VERSION}${SUFFIX}} if [ -z "$K3S_IMAGE" ]; then
REPO=${REPO:-rancher} source $(dirname $0)/version.sh
IMAGE_NAME=${IMAGE_NAME:-k3s} TAG=${TAG:-${VERSION}${SUFFIX}}
export K3S_IMAGE=${REPO}/${IMAGE_NAME}:${TAG} REPO=${REPO:-rancher}
IMAGE_NAME=${IMAGE_NAME:-k3s}
export K3S_IMAGE=${REPO}/${IMAGE_NAME}:${TAG}
fi
OUTPUT=$(pwd)/dist/artifacts OUTPUT=$(pwd)/dist/artifacts
mkdir -p ${OUTPUT} mkdir -p ${OUTPUT}