From a8a6a56939cf0b4f079be68a14d30adf6c1ee72f Mon Sep 17 00:00:00 2001 From: Divesh Angula Date: Fri, 29 Sep 2017 12:33:45 -0700 Subject: [PATCH] copy rook images to all nodes. --- tests/pipeline/Jenkinsfile.k8sSetup | 54 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/tests/pipeline/Jenkinsfile.k8sSetup b/tests/pipeline/Jenkinsfile.k8sSetup index 4e805849a..a1feaddff 100644 --- a/tests/pipeline/Jenkinsfile.k8sSetup +++ b/tests/pipeline/Jenkinsfile.k8sSetup @@ -20,13 +20,6 @@ pipeline { stages { stage('set up rook images') { steps { - //checkout scripts - sh "mkdir -p tests/scripts/" - sh "mkdir -p _output/charts/" - sh "wget -O tests/scripts/kubeadm.sh https://raw.githubusercontent.com/rook/rook/master/tests/scripts/kubeadm.sh" - sh "wget -O tests/scripts/kubeadm-rbd https://raw.githubusercontent.com/rook/rook/master/tests/scripts/kubeadm-rbd" - sh "wget -O tests/scripts/kubeadm-install.sh https://raw.githubusercontent.com/rook/rook/master/tests/scripts/kubeadm-install.sh" - sh "chmod +x tests/scripts/*.sh" script { if ( "${params.key}" == 'PR' ){ if ( "${params.PR}" == '' ){ @@ -44,28 +37,9 @@ pipeline { sh "wget -O version https://release.rook.io/build/master/${params.version}/version" } - //tag rook images need for testing - env.versionId = readFile('version').trim() - sh''' - #!/bin/bash - docker load -i rook.tar.gz - docker load -i toolbox.tar.gz - docker images - rookImg=$(docker images |grep rook | awk '{print $1}') - echo $rookImg - toolboxImg=$(docker images |grep toolbox | awk '{print $1}') - echo $toolboxImg - echo "helm Image:" - echo ${versionId} - docker tag $rookImg rook/rook:master - docker tag $rookImg rook/rook:${versionId} - docker tag $toolboxImg rook/toolbox:master - ''' - - } - stash name: 'test-scripts',includes: 'tests/scripts/' - + stash name: 'test-images', includes: 'rook.tar.gz,toolbox.tar.gz,version' + } } } //start 3 node k8s cluster @@ -74,6 +48,7 @@ pipeline { script{ withEnv(["KUBE_VERSION=${env.kube_version}"]){ echo "setting up 3 node k8s ${env.kube_version} cluster" + setUpRookImages() sh '''#!/bin/bash echo " setting up master" export KUBE_VERSION='''+ "${env.kube_version}" + ''' @@ -83,6 +58,8 @@ pipeline { token = readFile('ktoken').trim() } node("${params.node}-n1"){ + unstash 'test-images' + setUpRookImages() unstash 'test-scripts' sh '''#!/bin/bash echo " setting up node 1" @@ -90,6 +67,8 @@ pipeline { tests/scripts/kubeadm.sh install node ''' + "${token}" } node("${params.node}-n2"){ + unstash 'test-images' + setUpRookImages() unstash 'test-scripts' sh '''#!/bin/bash echo " setting up node 2" @@ -111,3 +90,22 @@ pipeline { } } } + +def setUpRookImages(){ + //tag rook images need for testing + env.versionId = readFile('version').trim() + sh''' + #!/bin/bash + docker load -i rook.tar.gz + docker load -i toolbox.tar.gz + docker images + rookImg=$(docker images |grep rook | awk '{print $1}') + echo $rookImg + toolboxImg=$(docker images |grep toolbox | awk '{print $1}') + echo $toolboxImg + echo "helm Image:" + echo ${versionId} + docker tag $rookImg rook/rook:master + docker tag $rookImg rook/rook:${versionId} + docker tag $toolboxImg rook/toolbox:master''' +}