Merge pull request #4161 from joepvd/prune-scl

Prune running under scl
openshift-eng · May 14, 2024 · 277ba1f · 277ba1f
2 parents b9f9d6e + 0eb333e
commit 277ba1f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 18 deletions.
diff --git a/jobs/build/accept-release/Jenkinsfile b/jobs/build/accept-release/Jenkinsfile
@@ -61,11 +61,7 @@ node {
             buildlib.withAppCiAsArtPublish() {
                 commonlib.shell(
                     script: """
-                        if [[ -f /bin/scl ]]; then
-                        scl enable rh-python38 -- python3 release-tool.py --message "${message}" --reason "${message}" --architecture ${params.ARCH} -c `oc config current-context` ${confirm_param} ${action} ${params.RELEASE_NAME}
-                        else
                         python3 release-tool.py --message "${message}" --reason "${message}" --architecture ${params.ARCH} -c `oc config current-context` ${confirm_param} ${action} ${params.RELEASE_NAME}
-                        fi
                         """,
                 )
             }

diff --git a/pipeline-scripts/buildlib.groovy b/pipeline-scripts/buildlib.groovy
@@ -140,13 +140,7 @@ def setup_venv() {
     VIRTUAL_ENV = "${env.WORKSPACE}/art-venv"
     commonlib.shell(script: "rm -rf ${VIRTUAL_ENV}")
 
-    commonlib.shell(script: """
-    if [[ -f /bin/scl ]]; then
-        scl enable rh-python38 -- python3 -m venv --system-site-packages --symlinks ${VIRTUAL_ENV}
-    else
-        python3.9 -m venv --system-site-packages --symlinks ${VIRTUAL_ENV}
-    fi
-    """)
+    commonlib.shell(script: "python3.9 -m venv --system-site-packages --symlinks ${VIRTUAL_ENV}")
 
     env.PATH = "${VIRTUAL_ENV}/bin:${env.PATH}"
 

diff --git a/scheduled-jobs/scanning/unresolved-art-threads/Jenkinsfile b/scheduled-jobs/scanning/unresolved-art-threads/Jenkinsfile
@@ -16,13 +16,7 @@ node() {
                             string(credentialsId: "art-bot-slack-signing-secret", variable: "SLACK_SIGNING_SECRET")
                         ]) {
             retry(10) {
-                commonlib.shell(script: """
-                    if [[ -f /bin/scl ]]; then
-                        scl enable rh-python38 -- scheduled-jobs/scanning/unresolved-art-threads/unresolved-thread-notification.py
-                    else
-                        python -- scheduled-jobs/scanning/unresolved-art-threads/unresolved-thread-notification.py
-                    fi
-                """)
+                commonlib.shell(script: "python -- scheduled-jobs/scanning/unresolved-art-threads/unresolved-thread-notification.py")
             }
         }
     } catch (e) {