Bump to OSL 1.35

Signed-off-by: gabriel-farache <[email protected]>
rhdhorchestrator · Nov 20, 2024 · f17cb0b · f17cb0b
1 parent 5b77a59
commit f17cb0b
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 17 deletions.
diff --git a/create-ocp-project/argfile.conf b/create-ocp-project/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 FLOW_NAME=create-ocp-project Serverless Workflow
 FLOW_SUMMARY=create-ocp-project Serverless Workflow

diff --git a/escalation/argfile.conf b/escalation/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 FLOW_NAME=escalation
 FLOW_SUMMARY=Ticket escalation workflow

diff --git a/escalation/jira-listener/argfile.conf b/escalation/jira-listener/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 FLOW_NAME=jira-listener
 FLOW_SUMMARY=jira-listener application

diff --git a/extendable-workflow/argfile.conf b/extendable-workflow/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 FLOW_NAME=extendable-workflow
 FLOW_SUMMARY=extendable-workflow workflow

diff --git a/greeting/argfile.conf b/greeting/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=
 
 FLOW_NAME=Greeting
 FLOW_SUMMARY=Greeting workflow

diff --git a/modify-vm-resources/argfile.conf b/modify-vm-resources/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 FLOW_NAME=modify-vm-resources Serverless Workflow
 FLOW_SUMMARY=modify-vm-resources Serverless Workflow

diff --git a/move2kube/argfile.conf b/move2kube/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 FLOW_NAME=move2kube Serverless Workflow
 FLOW_SUMMARY=move2kube Serverless Workflow

diff --git a/mta-v7.x/argfile.conf b/mta-v7.x/argfile.conf
@@ -1,8 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
-# For dev/nightly
+QUARKUS_EXTENSIONS=
 # QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:999-SNAPSHOT,org.kie:kie-addons-quarkus-persistence-jdbc:999-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4,org.kie:kie-addons-quarkus-monitoring-prometheus:999-SNAPSHOT,org.kie:kie-addons-quarkus-monitoring-sonataflow:999-SNAPSHOT
 
 FLOW_NAME=MTA v7.x Serverless Workflow

diff --git a/mtv-migration/argfile.conf b/mtv-migration/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 FLOW_NAME=MTV migration workflow
 FLOW_SUMMARY=MTV migration workflow

diff --git a/mtv-plan/argfile.conf b/mtv-plan/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 FLOW_NAME=MTV plan workflow
 FLOW_SUMMARY=MTV plan assessment workflow

diff --git a/pipeline/workflow-builder.Dockerfile b/pipeline/workflow-builder.Dockerfile
@@ -4,7 +4,7 @@
 ARG BUILDER_IMAGE
 
 # The default builder image is the released OSL 1.33 https://catalog.redhat.com/software/containers/openshift-serverless-1/logic-swf-builder-rhel8/6614edd826a5be569c111884?container-tabs=gti
-FROM ${BUILDER_IMAGE:-registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8@sha256:9a4093e195bec163c609381e3c0ceeec55f6e229c6a1def6f362517886faea71} AS builder
+FROM ${BUILDER_IMAGE:-registry-proxy.engineering.redhat.com/rh-osbs/openshift-serverless-1-logic-swf-builder-rhel8@sha256:ddb5b6307ad18f8ae9742bd13cfc382371b75ac6aeaf4e160d5fe5d783f1d8f4} AS builder
 
 #ENV MAVEN_REPO_URL=https://maven.repository.redhat.com/earlyaccess/all
 
@@ -13,7 +13,7 @@ FROM ${BUILDER_IMAGE:-registry.redhat.io/openshift-serverless-1/logic-swf-builde
 # When using nightly:
 # ARG QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:999-SNAPSHOT,org.kie:kie-addons-quarkus-persistence-jdbc:999-SNAPSHOT,io.quarkus:quarkus-jdbc-postgresql:3.8.4,io.quarkus:quarkus-agroal:3.8.4,org.kie:kie-addons-quarkus-monitoring-prometheus:999-SNAPSHOT,org.kie:kie-addons-quarkus-monitoring-sonataflow:999-SNAPSHOT
 # When using prod:
-ARG QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+ARG QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 # Args to pass to the Quarkus CLI
 # add extension command
@@ -34,9 +34,6 @@ RUN ls -la ./resources
 
 ENV swf_home_dir=/home/kogito/serverless-workflow-project
 RUN if [[ -d "./resources/src" ]]; then cp -r ./resources/src/* ./src/; fi
-# Workaround for https://github.com/apache/incubator-kie-kogito-runtimes/issues/3725
-RUN mvn quarkus:remove-extension -Dextension=org.kie:kie-addons-quarkus-monitoring-sonataflow:9.101.0.redhat-00007
-RUN mvn quarkus:remove-extension -Dextension=org.kie:kie-addons-quarkus-monitoring-prometheus:9.101.0.redhat-00007
 
 RUN /home/kogito/launch/build-app.sh ./resources
 

diff --git a/request-vm-cnv/argfile.conf b/request-vm-cnv/argfile.conf
@@ -1,7 +1,7 @@
 BUILDER_IMAGE=
 
 # FIXME Adding monitoring jar fails the build org.kie.kogito:kogito-addons-monitoring-prometheus:1.13.2.redhat-00011
-QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.101.0.redhat-00007,org.kie:kie-addons-quarkus-persistence-jdbc:9.101.0.redhat-00007,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002
+QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.102.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.102.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.6.redhat-00004,io.quarkus:quarkus-agroal:3.8.6.redhat-00004
 
 FLOW_NAME=request-vm-cnv Serverless Workflow
 FLOW_SUMMARY=request-vm-cnv Serverless Workflow