Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NO-ISSUE: Temporary removal of kogito-swf-{builder-,devmode} images from all Jenkins jobs #1762

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions .ci/jenkins/Jenkinsfile.deploy
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 0 additions & 2 deletions .ci/jenkins/Jenkinsfile.promote
Original file line number Diff line number Diff line change
Expand Up @@ -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(',')
}

Expand Down
3 changes: 2 additions & 1 deletion .ci/jenkins/dsl/jobs.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
74 changes: 0 additions & 74 deletions kogito-swf-builder-image.yaml

This file was deleted.

85 changes: 0 additions & 85 deletions kogito-swf-devmode-image.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion scripts/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
Loading