diff --git a/s2i/image.yaml b/s2i/image.yaml index 205e036eb..643bad96d 100644 --- a/s2i/image.yaml +++ b/s2i/image.yaml @@ -1,7 +1,7 @@ schema_version: 1 name: "kogito-image-real-name-on-overrides-file" -version: "0.7.0" +version: "0.6.1" # until this issue is not fixed use 8.0 tag. # https://github.com/rpm-software-management/microdnf/issues/50 # https://bugzilla.redhat.com/show_bug.cgi?id=1769831 diff --git a/s2i/kogito-imagestream.yaml b/s2i/kogito-imagestream.yaml index 1e6416712..8998109a2 100644 --- a/s2i/kogito-imagestream.yaml +++ b/s2i/kogito-imagestream.yaml @@ -15,18 +15,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '0.7.0-rc1' + - name: '0.6.1' annotations: description: Runtime image for Kogito based on Quarkus native image iconClass: icon-jbpm tags: runtime,kogito,quarkus supports: quarkus - version: '0.7.0-rc1' + version: '0.6.1' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-quarkus-ubi8:0.7.0-rc1 + name: quay.io/kiegroup/kogito-quarkus-ubi8:0.6.1 - kind: ImageStream apiVersion: v1 metadata: @@ -36,18 +36,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '0.7.0-rc1' + - name: '0.6.1' annotations: description: Runtime image for Kogito based on Quarkus JVM image iconClass: icon-jbpm tags: runtime,kogito,quarkus,jvm supports: quarkus - version: '0.7.0-rc1' + version: '0.6.1' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.7.0-rc1 + name: quay.io/kiegroup/kogito-quarkus-jvm-ubi8:0.6.1 - kind: ImageStream apiVersion: v1 metadata: @@ -57,18 +57,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '0.7.0-rc1' + - name: '0.6.1' annotations: description: Platform for building Kogito based on Quarkus iconClass: icon-jbpm tags: builder,kogito,quarkus supports: quarkus - version: '0.7.0-rc1' + version: '0.6.1' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.7.0-rc1 + name: quay.io/kiegroup/kogito-quarkus-ubi8-s2i:0.6.1 - kind: ImageStream apiVersion: v1 metadata: @@ -78,18 +78,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '0.7.0-rc1' + - name: '0.6.1' annotations: description: Runtime image for Kogito based on SpringBoot iconClass: icon-jbpm tags: runtime,kogito,springboot supports: springboot - version: '0.7.0-rc1' + version: '0.6.1' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-springboot-ubi8:0.7.0-rc1 + name: quay.io/kiegroup/kogito-springboot-ubi8:0.6.1 - kind: ImageStream apiVersion: v1 metadata: @@ -99,18 +99,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '0.7.0-rc1' + - name: '0.6.1' annotations: description: Platform for building Kogito based on Quarkus iconClass: icon-jbpm tags: builder,kogito,springboot supports: springboot - version: '0.7.0-rc1' + version: '0.6.1' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.7.0-rc1 + name: quay.io/kiegroup/kogito-springboot-ubi8-s2i:0.6.1 - kind: ImageStream apiVersion: v1 metadata: @@ -120,17 +120,17 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '0.7.0-rc1' + - name: '0.6.1' annotations: description: Runtime image for the Kogito Data Index Service iconClass: icon-jbpm tags: kogito,data-index - version: '0.7.0-rc1' + version: '0.6.1' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-data-index:0.7.0-rc1 + name: quay.io/kiegroup/kogito-data-index:0.6.1 - kind: ImageStream apiVersion: v1 metadata: @@ -140,14 +140,14 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '0.7.0-rc1' + - name: '0.6.1' annotations: description: Runtime image for the Kogito Jobs Service - Tech preview iconClass: icon-jbpm tags: kogito,jobs-service - version: '0.7.0-rc1' + version: '0.6.1' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service:0.7.0-rc1 \ No newline at end of file + name: quay.io/kiegroup/kogito-jobs-service:0.6.1 \ No newline at end of file diff --git a/s2i/modules/kogito-data-index/module.yaml b/s2i/modules/kogito-data-index/module.yaml index ee14a5032..24aff0237 100644 --- a/s2i/modules/kogito-data-index/module.yaml +++ b/s2i/modules/kogito-data-index/module.yaml @@ -1,11 +1,11 @@ schema_version: 1 name: org.kie.kogito.dataindex -version: "0.7.0-rc1" +version: "0.6.1" artifacts: -- name: data-index-service-8.0.0-SNAPSHOT-runner.jar - url: https://repository.jboss.org/org/kie/kogito/data-index-service/8.0.0-SNAPSHOT/data-index-service-8.0.0-20191209.212221-96-runner.jar - md5: 38aa048cc16efadf178a9ca4b2a7bf42 +- name: data-index-service-0.6.1-runner.jar + url: https://repository.jboss.org/org/kie/kogito/data-index-service/0.6.1/data-index-service-0.6.1-runner.jar + md5: ec8de0f37fc6e51137121e80ea112627 execute: - script: configure \ No newline at end of file diff --git a/s2i/modules/kogito-image-dependencies/module.yaml b/s2i/modules/kogito-image-dependencies/module.yaml index 252e78117..550aa5b3c 100644 --- a/s2i/modules/kogito-image-dependencies/module.yaml +++ b/s2i/modules/kogito-image-dependencies/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: org.kie.kogito.image.dependencies -version: "0.7.0-rc1" +version: "0.6.1" description: holds common dependencies across images execute: diff --git a/s2i/modules/kogito-infinispan-properties/module.yaml b/s2i/modules/kogito-infinispan-properties/module.yaml index 1e798922a..1d1cdf806 100644 --- a/s2i/modules/kogito-infinispan-properties/module.yaml +++ b/s2i/modules/kogito-infinispan-properties/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: org.kie.kogito.infinispan.properties -version: "0.7.0-rc1" +version: "0.6.1" envs: - name: "INFINISPAN_USEAUTH" diff --git a/s2i/modules/kogito-jobs-service/module.yaml b/s2i/modules/kogito-jobs-service/module.yaml index 18ccc4ca0..9dca473ca 100644 --- a/s2i/modules/kogito-jobs-service/module.yaml +++ b/s2i/modules/kogito-jobs-service/module.yaml @@ -1,11 +1,11 @@ schema_version: 1 name: org.kie.kogito.jobs.service -version: "0.7.0-rc1" +version: "0.6.1" artifacts: - name: kogito-jobs-service-runner.jar - url: https://repository.jboss.org/org/kie/kogito/jobs-service/8.0.0-SNAPSHOT/jobs-service-8.0.0-20191209.211907-21-runner.jar - md5: 6f2cef2c988acde3dc1a52d69cdb9f71 + url: https://repository.jboss.org/org/kie/kogito/jobs-service/0.6.1/jobs-service-0.6.1-runner.jar + md5: d6ec689d4646f85e0c4c427662d19ef5 execute: - script: configure \ No newline at end of file diff --git a/s2i/modules/kogito-launch-scripts/module.yaml b/s2i/modules/kogito-launch-scripts/module.yaml index e3d1d935b..5cf369397 100644 --- a/s2i/modules/kogito-launch-scripts/module.yaml +++ b/s2i/modules/kogito-launch-scripts/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: org.kie.kogito.launch.scripts -version: "0.7.0-rc1" +version: "0.6.1" execute: - script: configure \ No newline at end of file diff --git a/s2i/modules/kogito-quarkus-jvm/module.yaml b/s2i/modules/kogito-quarkus-jvm/module.yaml index 06e8807d1..03bf26321 100644 --- a/s2i/modules/kogito-quarkus-jvm/module.yaml +++ b/s2i/modules/kogito-quarkus-jvm/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: org.kie.kogito.quarkus.jvm -version: "0.7.0-rc1" +version: "0.6.1" execute: - script: configure diff --git a/s2i/modules/kogito-quarkus-s2i/module.yaml b/s2i/modules/kogito-quarkus-s2i/module.yaml index a65f82f13..734589e30 100644 --- a/s2i/modules/kogito-quarkus-s2i/module.yaml +++ b/s2i/modules/kogito-quarkus-s2i/module.yaml @@ -1,10 +1,10 @@ schema_version: 1 name: org.kie.kogito.quarkus.s2i -version: "0.7.0-rc1" +version: "0.6.1" execute: - script: configure envs: - name: "KOGITO_VERSION" - value: "0.7.0-rc1" \ No newline at end of file + value: "0.6.1" \ No newline at end of file diff --git a/s2i/modules/kogito-quarkus/module.yaml b/s2i/modules/kogito-quarkus/module.yaml index ba6fe00a2..7cd06f587 100644 --- a/s2i/modules/kogito-quarkus/module.yaml +++ b/s2i/modules/kogito-quarkus/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: org.kie.kogito.quarkus -version: "0.7.0-rc1" +version: "0.6.1" execute: - script: configure diff --git a/s2i/modules/kogito-s2i-core/module.yaml b/s2i/modules/kogito-s2i-core/module.yaml index 788a2d0cd..639191cb0 100644 --- a/s2i/modules/kogito-s2i-core/module.yaml +++ b/s2i/modules/kogito-s2i-core/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: org.kie.kogito.s2i.core -version: '0.7.0-rc1' +version: '0.6.1' description: Kogito s2i core module. All s2i files shoul be placed here. labels: diff --git a/s2i/modules/kogito-springboot-s2i/module.yaml b/s2i/modules/kogito-springboot-s2i/module.yaml index af2f56965..0980f29a0 100644 --- a/s2i/modules/kogito-springboot-s2i/module.yaml +++ b/s2i/modules/kogito-springboot-s2i/module.yaml @@ -1,10 +1,10 @@ schema_version: 1 name: org.kie.kogito.springboot.s2i -version: "0.7.0-rc1" +version: "0.6.1" execute: - script: configure envs: - name: "KOGITO_VERSION" - value: "0.7.0-rc1" \ No newline at end of file + value: "0.6.1" \ No newline at end of file diff --git a/s2i/modules/kogito-springboot/module.yaml b/s2i/modules/kogito-springboot/module.yaml index 3bdbc2fb9..c7dcfe9b7 100644 --- a/s2i/modules/kogito-springboot/module.yaml +++ b/s2i/modules/kogito-springboot/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: org.kie.kogito.springboot -version: "0.7.0-rc1" +version: "0.6.1" execute: - script: configure diff --git a/s2i/modules/kogito-system-user/module.yaml b/s2i/modules/kogito-system-user/module.yaml index 521662928..ae274ee27 100644 --- a/s2i/modules/kogito-system-user/module.yaml +++ b/s2i/modules/kogito-system-user/module.yaml @@ -1,6 +1,6 @@ schema_version: 1 name: org.kie.kogito.system.user -version: "0.7.0-rc1" +version: "0.6.1" execute: - script: add-user diff --git a/s2i/tests/features/kogito-data-index.feature b/s2i/tests/features/kogito-data-index.feature index 17ca527e5..3f00d7b8e 100644 --- a/s2i/tests/features/kogito-data-index.feature +++ b/s2i/tests/features/kogito-data-index.feature @@ -14,7 +14,7 @@ Feature: Kogito-data-index feature. Scenario: verify if the binary index is available on /home/kogito When container is started with command bash - Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-8.0.0-SNAPSHOT-runner.jar + Then run sh -c 'ls /home/kogito/bin/data-index-service-*-runner.jar' in container and immediately check its output for /home/kogito/bin/data-index-service-0.6.1-runner.jar Scenario: Verify data-index default configuration When container is started with env diff --git a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature index 246f71276..e1fc54bbd 100644 --- a/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature +++ b/s2i/tests/features/kogito-quarkus-ubi8-s2i.feature @@ -2,7 +2,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port - Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest + Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-ubi8:latest | variable | value | | LIMIT_MEMORY | 2147483648 | Then check that page is served @@ -11,13 +11,13 @@ Feature: kogito-quarkus-ubi8-s2i image tests | path | /hello | | wait | 80 | | expected_phrase | Mario is older than Mark | - And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner should exist + And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner should exist And file /home/kogito/ssl-libs/libsunec.so should exist And file /home/kogito/cacerts should exist And s2i build log should contain -J-Xmx1717986918 Scenario: Verify if the s2i build is finished as expected performing a non native build - Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest + Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest | variable | value | | NATIVE | false | | JAVA_OPTIONS | -Dquarkus.log.level=DEBUG | @@ -27,12 +27,12 @@ Feature: kogito-quarkus-ubi8-s2i image tests | path | /hello | | wait | 80 | | expected_phrase | Mario is older than Mark | - And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner.jar should exist + And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist And container log should contain DEBUG [io.qua. And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port - Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest + Given s2i build /tmp/kogito-examples from drools-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest | variable | value | | NATIVE | false | Then check that page is served @@ -41,10 +41,10 @@ Feature: kogito-quarkus-ubi8-s2i image tests | path | /hello | | wait | 80 | | expected_phrase | Mario is older than Mark | - And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner.jar should exist + And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build and if it is listening on the expected port - Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest + Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest | variable | value | | NATIVE | false | | ARTIFACT_DIR | drools-quarkus-example/target | @@ -55,17 +55,17 @@ Feature: kogito-quarkus-ubi8-s2i image tests | path | /hello | | wait | 80 | | expected_phrase | Mario is older than Mark | - And file /home/kogito/bin/drools-quarkus-example-0.6.0-runner.jar should exist + And file /home/kogito/bin/drools-quarkus-example-0.6.1-runner.jar should exist Scenario: Perform a incremental s2i build - Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.0 + Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.1 | variable | value | | NATIVE | false | Then s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected. Scenario: Perform a second incremental s2i build - Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.0 + Given s2i build https://github.com/kiegroup/kogito-examples.git from drools-quarkus-example with env and incremental using 0.6.1 | variable | value | | NATIVE | false | Then s2i build log should contain Expanding artifacts from incremental build... @@ -95,7 +95,7 @@ Feature: kogito-quarkus-ubi8-s2i image tests And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 19.2.1 Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly - Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest + Given s2i build /tmp/kogito-examples from dmn-quarkus-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-quarkus-jvm-ubi8:latest | variable | value | | NATIVE | false | | KOGITO_VERSION | 8.0.0-SNAPSHOT | diff --git a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature index 9c729db9a..a2efbe211 100644 --- a/s2i/tests/features/kogito-springboot-ubi8-s2i.feature +++ b/s2i/tests/features/kogito-springboot-ubi8-s2i.feature @@ -3,7 +3,7 @@ Feature: kogito-springboot-ubi8-s2i image tests Scenario: Verify if the s2i build is finished as expected - Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.6.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest + Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example using 0.6.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest | variable | value | | JAVA_OPTIONS | -Ddebug=true | Then check that page is served @@ -12,12 +12,12 @@ Feature: kogito-springboot-ubi8-s2i image tests | path | /orders/1 | | wait | 80 | | expected_status_code | 204 | - And file /home/kogito/bin/jbpm-springboot-example-0.6.0.jar should exist + And file /home/kogito/bin/jbpm-springboot-example-0.6.1.jar should exist And container log should contain DEBUG o.s.boot.SpringApplication.load And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true Scenario: Verify if the s2i build is finished as expected using multi-module build - Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.0 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest + Given s2i build https://github.com/kiegroup/kogito-examples.git from . using 0.6.1 and runtime-image quay.io/kiegroup/kogito-springboot-ubi8:latest | variable | value | | JAVA_OPTIONS | -Ddebug=true | | ARTIFACT_DIR | jbpm-springboot-example/target | @@ -28,23 +28,23 @@ Feature: kogito-springboot-ubi8-s2i image tests | path | /orders/1 | | wait | 80 | | expected_status_code | 204 | - And file /home/kogito/bin/jbpm-springboot-example-0.6.0.jar should exist + And file /home/kogito/bin/jbpm-springboot-example-0.6.1.jar should exist And container log should contain DEBUG o.s.boot.SpringApplication.load And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true Scenario: Scenario: Perform a incremental s2i build - Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.0 + Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.1 Then check that page is served | property | value | | port | 8080 | | path | /orders/1 | | wait | 80 | | expected_status_code | 204 | - And file /home/kogito/bin/jbpm-springboot-example-0.6.0.jar should exist + And file /home/kogito/bin/jbpm-springboot-example-0.6.1.jar should exist # Since the same image is used we can do a subsequent incremental build and verify if it is working as expected. Scenario: Perform a second incremental s2i build - Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.0 + Given s2i build https://github.com/kiegroup/kogito-examples.git from jbpm-springboot-example with env and incremental using 0.6.1 Then s2i build log should contain Expanding artifacts from incremental build... And s2i build log should not contain WARNING: Clean build will be performed because of error saving previous build artifacts diff --git a/s2i/tests/test-apps/clone-repo.sh b/s2i/tests/test-apps/clone-repo.sh index c566cbe54..14e854755 100755 --- a/s2i/tests/test-apps/clone-repo.sh +++ b/s2i/tests/test-apps/clone-repo.sh @@ -8,7 +8,7 @@ rm -rf kogito-examples/ git clone https://github.com/kiegroup/kogito-examples.git cd kogito-examples/drools-quarkus-example git fetch origin --tags -git checkout -b 0.6.0 0.6.0 +git checkout -b 0.6.1 0.6.1 # by adding the application.properties file telling quarkus to start on # port 10000, the purpose of this tests is make sure that the images