Temporary removal of kogito-swf-{builder-,devmode} images from all Je…

…nkins jobs (#1762)
apache · Apr 29, 2024 · 692d990 · 692d990
1 parent 2731f44
commit 692d990
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 167 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
@@ -441,10 +441,7 @@ String[] getImages() {
     if (env.IMAGES_LIST) {
         return env.IMAGES_LIST.split(',')
     }
-    String images = sh(returnStdout: true, script: "make list | tr '\\n' ','").trim()
-    // Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
-    images = images.replace("kogito-swf-builder,", "").replace("kogito-swf-devmode,", "")
-    return images.split(',')
+    return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
 }
 
 String getQuarkusPlatformVersion() {

diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
@@ -366,8 +366,6 @@ String getNewImageTag() {
 
 String[] getImages() {
     String images = getOldImageNames() ?: env.IMAGES_LIST ?: runPythonCommand("make list | tr '\\n' ','", true).trim()
-    // Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
-    images = images.replace("kogito-swf-builder,", "").replace("kogito-swf-devmode,", "")
     return images.split(',')
 }
 

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
@@ -348,7 +348,8 @@ void setupWeeklyDeployJob(JobType jobType) {
         QUARKUS_PLATFORM_NEXUS_URL: Utils.getMavenQuarkusPlatformRepositoryUrl(this),
     ])
 
-    jobParams.env.put('IMAGES_LIST', 'kogito-swf-builder,kogito-swf-devmode,kogito-base-builder')
+    // Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
+    jobParams.env.put('IMAGES_LIST', 'kogito-base-builder')
 
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
         parameters {

diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
diff --git a/scripts/common.py b/scripts/common.py
@@ -52,7 +52,8 @@
                               "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone",
                               }
 
-SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-swf-devmode", "kogito-base-builder"}
+# Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release
+SWF_BUILDER_IMAGES = {"kogito-base-builder"}
 
 
 def yaml_loader():