This is an automated email from the ASF dual-hosted git repository.
porcelli pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-images.git
The following commit(s) were added to refs/heads/main by this push:
new 692d990e Temporary removal of kogito-swf-{builder-,devmode} images
from all Jenkins jobs (#1762)
692d990e is described below
commit 692d990e03142825df8e18a83f78c8db766ca3e3
Author: Rodrigo Antunes <[email protected]>
AuthorDate: Mon Apr 29 17:42:02 2024 -0300
Temporary removal of kogito-swf-{builder-,devmode} images from all Jenkins
jobs (#1762)
---
.ci/jenkins/Jenkinsfile.deploy | 5 +--
.ci/jenkins/Jenkinsfile.promote | 2 -
.ci/jenkins/dsl/jobs.groovy | 3 +-
kogito-swf-builder-image.yaml | 74 -----------------------------------
kogito-swf-devmode-image.yaml | 85 -----------------------------------------
scripts/common.py | 3 +-
6 files changed, 5 insertions(+), 167 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index e768cb7f..2391a1ae 100644
--- 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
index 428a9bc9..c3b2164b 100644
--- 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
index cad3d606..bb899371 100644
--- 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
deleted file mode 100644
index 59cad93c..00000000
--- a/kogito-swf-builder-image.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- - name: builder
- from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
- version: "999-SNAPSHOT"
- modules:
- repositories:
- - path: modules
- install:
- - name: org.kie.kogito.system.user
- - name: org.kie.kogito.logging
- - name: org.kie.kogito.launch.scripts
- - name: org.kie.kogito.dynamic.resources
- - name: org.kie.kogito.maven.common
- - name: org.kie.kogito.project.versions
- - name: org.kie.kogito.swf.common.scripts
- - name: org.kie.kogito.swf.builder.build-config
- - name: org.kie.kogito.swf.common.build
-
- - name: "quay.io/kiegroup/kogito-swf-builder"
- from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
- version: "999-SNAPSHOT"
- description: "Kogito Serverless Workflow base builder with Quarkus
extensions libraries preinstalled"
-
- labels:
- - name: "io.openshift.s2i.scripts-url"
- value: "image:///usr/local/s2i"
- - name: "io.openshift.s2i.destination"
- value: "/tmp"
- - name: "io.quarkus.platform.version"
- value: "3.2.10.Final"
- - name: "org.kie.kogito.version"
- value: "999-SNAPSHOT"
- - name: "maintainer"
- value: "Apache KIE <[email protected]>"
- - name: "io.k8s.description"
- value: "Kogito Serverless Workflow base builder with Quarkus
extensions libraries preinstalled."
- - name: "io.k8s.display-name"
- value: "Kogito SWF Builder"
- - name: "io.openshift.tags"
- value: "kogito,builder,serverless,workflow"
-
- modules:
- repositories:
- - path: modules
- install:
- - name: org.kie.kogito.system.user
- - name: org.kie.kogito.logging
- - name: org.kie.kogito.launch.scripts
- - name: org.kie.kogito.dynamic.resources
- - name: org.kie.kogito.maven.common
- - name: org.kie.kogito.project.versions
- - name: org.kie.kogito.swf.common.scripts
- - name: org.kie.kogito.swf.builder.runtime.community
-
- run:
- workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
- user: 1001
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
deleted file mode 100644
index 18e918c8..00000000
--- a/kogito-swf-devmode-image.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
- - name: builder
- from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
- version: "999-SNAPSHOT"
- modules:
- repositories:
- - path: modules
- install:
- - name: org.kie.kogito.system.user
- - name: org.kie.kogito.logging
- - name: org.kie.kogito.launch.scripts
- - name: org.kie.kogito.dynamic.resources
- - name: org.kie.kogito.maven.common
- - name: org.kie.kogito.project.versions
- - name: org.kie.kogito.swf.common.scripts
- - name: org.kie.kogito.swf.devmode.build-config
- - name: org.kie.kogito.swf.common.build
-
- packages:
- manager: microdnf
-
- - name: "quay.io/kiegroup/kogito-swf-devmode"
- from: "registry.access.redhat.com/ubi8/openjdk-17:1.19"
- version: "999-SNAPSHOT"
- description: "Kogito Serverless Workflow development mode with Quarkus
extensions libraries preinstalled"
-
- labels:
- - name: "io.quarkus.platform.version"
- value: "3.2.10.Final"
- - name: "org.kie.kogito.version"
- value: "999-SNAPSHOT"
- - name: "maintainer"
- value: "Apache KIE <[email protected]>"
- - name: "io.k8s.description"
- value: "Kogito Serverless Workflow base builder with Quarkus
extensions libraries preinstalled."
- - name: "io.k8s.display-name"
- value: "Kogito SWF Builder"
- - name: "io.openshift.tags"
- value: "kogito,development,serverless,workflow"
- - name: "io.openshift.expose-services"
- value: "8080:http,5005:http"
-
- packages:
- manager: microdnf
-
- modules:
- repositories:
- - path: modules
- install:
- - name: org.kie.kogito.system.user
- - name: org.kie.kogito.logging
- - name: org.kie.kogito.launch.scripts
- - name: org.kie.kogito.dynamic.resources
- - name: org.kie.kogito.maven.common
- - name: org.kie.kogito.project.versions
- - name: org.kie.kogito.swf.common.scripts
- - name: org.kie.kogito.swf.devmode.runtime.common
- - name: org.kie.kogito.swf.devmode.runtime.community
-
- ports:
- - value: 8080
- - value: 5005
-
- run:
- workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}"
- user: 1001
- cmd:
- - "/home/kogito/launch/run-app-devmode.sh"
diff --git a/scripts/common.py b/scripts/common.py
index 9ccdeccc..37f2ed90 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -52,7 +52,8 @@ SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral",
"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():
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
