diff --git a/jenkinsfiles/ginkgo-kernel.Jenkinsfile b/jenkinsfiles/ginkgo-kernel.Jenkinsfile index 57a081ce3302..6dbf3dddb8a8 100644 --- a/jenkinsfiles/ginkgo-kernel.Jenkinsfile +++ b/jenkinsfiles/ginkgo-kernel.Jenkinsfile @@ -37,6 +37,10 @@ pipeline { returnStdout: true, script: 'if [ "${JobKernelVersion}" = "net-next" ]; then echo -n "0"; else echo -n ""; fi' )}""" + RUN_QUARANTINED="""${sh( + returnStdout: true, + script: 'if [ "${RunQuarantined}" = "" ]; then echo -n "false"; else echo -n "${RunQuarantined}"; fi' + )}""" } options { @@ -170,7 +174,7 @@ pipeline { } steps { sh 'env' - sh 'cd ${TESTDIR}; HOME=${GOPATH} ginkgo --focus="$(python get-gh-comment-info.py "${ghprbCommentBody}" | sed "s/^$/K8s*/" | sed "s/Runtime.*/NoTests/")" -v --failFast=${FAILFAST} -- -cilium.provision=false -cilium.timeout=${GINKGO_TIMEOUT} -cilium.kubeconfig=${TESTDIR}/vagrant-kubeconfig -cilium.passCLIEnvironment=true -cilium.registry=$(./print-node-ip.sh)' + sh 'cd ${TESTDIR}; HOME=${GOPATH} ginkgo --focus="$(python get-gh-comment-info.py "${ghprbCommentBody}" | sed "s/^$/K8s*/" | sed "s/Runtime.*/NoTests/")" -v --failFast=${FAILFAST} -- -cilium.provision=false -cilium.timeout=${GINKGO_TIMEOUT} -cilium.kubeconfig=${TESTDIR}/vagrant-kubeconfig -cilium.passCLIEnvironment=true -cilium.registry=$(./print-node-ip.sh) -cilium.runQuarantined=${RUN_QUARANTINED}' } post { always { diff --git a/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile b/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile index 55e0ac6b9f83..a07aafc6211e 100644 --- a/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile +++ b/jenkinsfiles/ginkgo-runtime-kernel.Jenkinsfile @@ -20,6 +20,10 @@ pipeline { )}""" TESTED_SUITE="runtime" FAILFAST=setIfLabel("ci/fail-fast", "true", "false") + RUN_QUARANTINED="""${sh( + returnStdout: true, + script: 'if [ "${RunQuarantined}" = "" ]; then echo -n "false"; else echo -n "${RunQuarantined}"; fi' + )}""" } options { @@ -132,7 +136,7 @@ pipeline { TESTDIR="${GOPATH}/${PROJ_PATH}/test" } steps { - sh 'cd ${TESTDIR}; ginkgo --focus="$(python get-gh-comment-info.py "${ghprbCommentBody}" | sed "s/^$/Runtime.*/" | sed "s/K8s.*/NoTests/")" -v --failFast=${FAILFAST} -- -cilium.provision=false -cilium.timeout=${GINKGO_TIMEOUT}' + sh 'cd ${TESTDIR}; ginkgo --focus="$(python get-gh-comment-info.py "${ghprbCommentBody}" | sed "s/^$/Runtime.*/" | sed "s/K8s.*/NoTests/")" -v --failFast=${FAILFAST} -- -cilium.provision=false -cilium.timeout=${GINKGO_TIMEOUT} -cilium.runQuarantined=${RUN_QUARANTINED}' } post { always {