diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 0b746ae..ecff7d4 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -3,10 +3,6 @@ import org.rookout.testsUtil.TestUtilities def label = "worker-${UUID.randomUUID().toString()}" -static def getDockerTagNameForRegression(testType, jobName) { - return "us.gcr.io/rookout/${testType}-${jobName}:latest" -} - podCreator.initMain(label: label) { node(label) { print(pwd()) @@ -18,8 +14,8 @@ podCreator.initMain(label: label) { def scriptToUse = libraryResource 'generate_tests.groovy' def jobName = "tutorial-python" def testType = "regression-test" - def dockerTag = getDockerTagNameForRegression(testType, jobName) - sh('docker build . -t ${dockerTag} --build-arg GIT_COMMIT=$(git rev-parse HEAD) --build-arg GIT_ORIGIN=$(git config --get remote.origin.url) && gcloud docker -- push ${dockerTag}') + def dockerTag = TestUtilities.getDockerTagNameForRegression(jobName) + sh("docker build . -t ${dockerTag} --build-arg GIT_COMMIT=\$(git rev-parse HEAD) --build-arg GIT_ORIGIN=\$(git config --get remote.origin.url) && gcloud docker -- push ${dockerTag}") TestUtilities.createTest(this, scriptToUse, jobName, pwd() + "/.jenkins", "Jenkinsfile.test") stage ('Run the tests') { def rookoutVersionInFile = sh(script: "cat ${pwd()}/requirements.txt | grep 'rook' | cut -d '=' -f 2", returnStdout: true)