From 5d12aec6314f4923b5e05fa5457b077258aba3da Mon Sep 17 00:00:00 2001 From: Maciej Kwiek Date: Fri, 6 Mar 2020 16:41:42 +0100 Subject: [PATCH] ci: Use already built nightly image to push to nightly Signed-off-by: Maciej Kwiek --- jenkinsfiles/Jenkinsfile.nightly | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/jenkinsfiles/Jenkinsfile.nightly b/jenkinsfiles/Jenkinsfile.nightly index b5a27552bcd5..d2d85ef79cae 100644 --- a/jenkinsfiles/Jenkinsfile.nightly +++ b/jenkinsfiles/Jenkinsfile.nightly @@ -70,22 +70,6 @@ pipeline { } } } - stage('Nightly-Docker-Image') { - when { - environment name: 'GIT_BRANCH', value: 'origin/master' - } - steps { - withDockerRegistry([ credentialsId: "NIGHTLY_DOCKER_HUB_CRED", url: "" ]) { - dir('${GOPATH}/${PROJ_PATH}') { - sh 'make docker-image' - } - sh 'docker tag cilium/cilium:latest cilium/nightly:latest' - sh 'docker tag cilium/nightly:latest cilium/nightly:${NIGHTLY_TAG}' - sh 'docker push cilium/nightly:${NIGHTLY_TAG}' - sh 'docker push cilium/nightly:latest' - } - } - } stage('Make Cilium images') { steps { sh 'cd ${TESTDIR}; ./make-images-push-to-local-registry.sh $(./print-node-ip.sh) latest' @@ -100,6 +84,19 @@ pipeline { } } } + stage('Nightly-Docker-Image') { + when { + environment name: 'GIT_BRANCH', value: 'origin/master' + } + steps { + withDockerRegistry([ credentialsId: "NIGHTLY_DOCKER_HUB_CRED", url: "" ]) { + sh 'docker tag cilium/cilium:latest cilium/nightly:latest' + sh 'docker tag cilium/nightly:latest cilium/nightly:${NIGHTLY_TAG}' + sh 'docker push cilium/nightly:${NIGHTLY_TAG}' + sh 'docker push cilium/nightly:latest' + } + } + } stage('Nightly-Tests') { environment { K8S_NODES=4