diff --git a/Jenkinsfile b/Jenkinsfile index 641ad6141..434f3be33 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -224,7 +224,9 @@ pipeline { stage('publishToRepository RPM tests') { when { beforeAgent true - expression { env.NO_CI_TESTING != 'true' } + /* disabled until https://daosio.atlassian.net/browse/SRE-3161 is fixed + expression { env.NO_CI_TESTING != 'true' } */ + expression { false } } agent { dockerfile { @@ -264,7 +266,9 @@ pipeline { stage('publishToRepository DEB tests') { when { beforeAgent true - expression { env.NO_CI_TESTING != 'true' } + /* disabled until https://daosio.atlassian.net/browse/SRE-3161 is fixed + expression { env.NO_CI_TESTING != 'true' } */ + expression { false } } agent { dockerfile { @@ -304,11 +308,14 @@ pipeline { stage('provisionNodes on EL 9 with master Repo') { when { beforeAgent true + /* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed expression { env.NO_CI_TESTING != 'true' && cachedCommitPragma('Skip-el9-provisioning-test') != 'true' && daosLatestVersion('master') != '' } + */ + expression { false } } agent { label 'ci_vm1' @@ -347,10 +354,13 @@ pipeline { stage('provisionNodes on EL 8 with slurm') { when { beforeAgent true + /* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed expression { env.NO_CI_TESTING != 'true' && daosLatestVersion('master') != '' } + */ + expression { false } } agent { label 'ci_vm1' @@ -379,10 +389,13 @@ pipeline { stage('provisionNodes on Leap 15 with slurm') { when { beforeAgent true + /* disabled until https://daosio.atlassian.net/browse/SRE-3162 is fixed expression { env.NO_CI_TESTING != 'true' && daosLatestVersion('master') != '' } + */ + expression { false } } agent { label 'ci_vm1' diff --git a/vars/dockerBuildArgs.groovy b/vars/dockerBuildArgs.groovy index 5186198a8..02ab45190 100644 --- a/vars/dockerBuildArgs.groovy +++ b/vars/dockerBuildArgs.groovy @@ -64,6 +64,11 @@ String call(Map config = [:]) { } } + if (env.DAOS_NO_PROXY) { + println "DAOS_NO_PROXY: $DAOS_NO_PROXY" + ret_str += ' --build-arg DAOS_NO_PROXY' + '="' + env.DAOS_NO_PROXY + '"' + } + String https_proxy = '' if (env.DAOS_HTTPS_PROXY) { https_proxy = env.DAOS_HTTPS_PROXY diff --git a/vars/functionalTest.groovy b/vars/functionalTest.groovy index 09f9689ee..aa7b949d3 100755 --- a/vars/functionalTest.groovy +++ b/vars/functionalTest.groovy @@ -114,16 +114,7 @@ Map call(Map config = [:]) { run_test_config['context'] = context run_test_config['description'] = description - String https_proxy = '' - if (env.DAOS_HTTPS_PROXY) { - https_proxy = "${env.DAOS_HTTPS_PROXY}" - } else if (env.HTTPS_PROXY) { - https_proxy = "${env.HTTPS_PROXY}" - } String script = 'if ! pip3 install' - if (https_proxy) { - script += ' --proxy "' + https_proxy + '"' - } script += ''' --upgrade --upgrade-strategy only-if-needed launchable; then set +e echo "Failed to install launchable" diff --git a/vars/functionalTestPostV2.groovy b/vars/functionalTestPostV2.groovy index 42369091d..1b395517e 100755 --- a/vars/functionalTestPostV2.groovy +++ b/vars/functionalTestPostV2.groovy @@ -98,19 +98,9 @@ void call(Map config = [:]) { script: 'ci/functional/launchable_analysis "' + fileName + '"') } - String https_proxy = '' - if (env.DAOS_HTTPS_PROXY) { - https_proxy = "${env.DAOS_HTTPS_PROXY}" - } else if (env.HTTPS_PROXY) { - https_proxy = "${env.HTTPS_PROXY}" - } String script = 'pip3 install' - if (https_proxy) { - script += ' --proxy "' + https_proxy + '"' - } script += ' --user --upgrade launchable~=1.0' - sh(label: 'Install Launchable', script: script)