diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f554a992c..9511f9aad 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -18,9 +18,6 @@ How to retest this PR or trigger a specific build: - (Re)run Jenkins tests Please add comment: Jenkins [test|retest] this - -- Prod tests - Please add comment: Jenkins (re)run [prod|Prod|PROD]
diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml index d5af992a8..98a5199ba 100644 --- a/.github/workflows/kogito-images-pr-check.yml +++ b/.github/workflows/kogito-images-pr-check.yml @@ -44,9 +44,6 @@ jobs: - name: validate kogito imagestream run: | ${HOME}/openshift-template-validator-linux-amd64 validate -f kogito-imagestream.yaml - - name: validate logic imagestream - run: | - ${HOME}/openshift-template-validator-linux-amd64 validate -f logic-imagestream.yaml shellcheck: concurrency: diff --git a/Makefile b/Makefile index 852d729af..7feb4fe5d 100644 --- a/Makefile +++ b/Makefile @@ -55,26 +55,6 @@ ifneq ($(ignore_test),true) tests/shell/run.sh ${image_name} "quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}" endif -# Build all images -.PHONY: build-prod -# start to build the images -build-prod: - @for iname in $(shell make list arg=--prod); do make build-prod-image image_name=$${iname}; done - - -.PHONY: build-prod-image -image_name= -build-prod-image: clone-repos _build-prod-image - -_build-prod-image: -ifneq ($(ignore_build),true) - scripts/build-kogito-apps-components.sh ${image_name} ${KOGITO_APPS_TARGET_BRANCH} ${KOGITO_APPS_TARGET_URI}; - scripts/build-product-image.sh "build" $(image_name) ${build_options} ${BUILD_ENGINE} -endif -# if ignore_test is set to true, ignore the tests -ifneq ($(ignore_test),true) - scripts/build-product-image.sh "test" $(image_name) ${test_options} -endif # push images to quay.io, this requires permissions under kiegroup organization .PHONY: push @@ -116,9 +96,3 @@ push-local-registry: .PHONY: bats bats: ./scripts/run-bats.sh - -.PHONY: container-build-osbs -prod_component= -container-build-osbs: - echo "calling RHPAM container-build-osbs......................................" - $(CEKIT_CMD) --descriptor $(prod_component).yaml --redhat build ${build_options} osbs --assume-yes ${osbs_options} \ No newline at end of file diff --git a/README.md b/README.md index 8a3a8d66c..9be81e495 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,10 @@ Table of Contents - [Kogito Runtime Native Image Example](#kogito-runtime-native-image-example) - [Kogito Component Images](#kogito-component-images) - [Kogito Data Index Component Images](#kogito-data-index-component-images) - - [Kogito Explainability Component Image](#kogito-explainability-component-image) - - [Kogito Trusty Component Image](#kogito-trusty-component-image) - [Kogito Jobs Service Component Images](#kogito-jobs-service-component-images) - [Jobs Services All-in-one](#jobs-services-all-in-one) - [Kogito Management Console Component Image](#kogito-management-console-component-image) - [Kogito Task Console Component Image](#kogito-task-console-component-image) - - [Kogito Trusty UI Component Image](#kogito-trusty-ui-component-image) - [Kogito JIT Runner Component Image](#kogito-jit-runner-component-image) - [Using Kogito Images to Deploy Apps on OpenShift](#using-kogito-images-to-deploy-apps-on-openshift) - [Using released images](#using-released-images) @@ -84,7 +81,7 @@ To interact with Kogito images, you would need to install the needed dependencie * Moby Engine or Docker CE * Podman can be use to build the images, but at this moment CeKit does not support it, so images build with podman cannot be tested with CeKit. - * [CeKit 3.6.0+](https://docs.cekit.io/en/latest/): + * [CeKit 4.8.0+](https://docs.cekit.io/en/latest/): * CeKit also has its own dependencies: * python packages: docker, docker-squash, odcs-client. * All of those can be handled with pip, including CeKit. @@ -170,7 +167,7 @@ For more information about what is installed on this image, take a look [here](k **modules.install** section. -#### Kogito SWF (Serverless Workflow) Builder Image usage +#### SonataFlow Builder Image usage ##### Using as a builder @@ -205,7 +202,7 @@ Replace `` with your local filesystem containing your workf After the image bootstrap, you can access [http://localhost:8080/q/swagger-ui](http://localhost:8080/q/swagger-ui) and test the workflow application right away! -##### Using the Kogito SWF Builder Image nightly image +##### Using the SonataFlow Builder Image nightly image The nightly builder image has been built and optimized with an internal nightly build of the Quarkus Platform. There are 2 environment variables that should not be changed when using it: @@ -602,24 +599,15 @@ Order has been created Order[12345] with assigned approver JOHN The Kogito Component Images can be considered as lightweight images that will complement the Kogito core engine by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications. -Today we have 16 Kogito Component Images: +Today we have the following Kogito Component Images: -* [quay.io/kiegroup/kogito-data-index-infinispan](https://quay.io/kiegroup/kogito-data-index-infinispan) * [quay.io/kiegroup/kogito-data-index-ephemeral](https://quay.io/kiegroup/kogito-data-index-ephemeral) -* [quay.io/kiegroup/kogito-data-index-mongodb](https://quay.io/kiegroup/kogito-data-index-mongodb) * [quay.io/kiegroup/kogito-data-index-postgresql](https://quay.io/kiegroup/kogito-data-index-postgresql) -* [quay.io/kiegroup/kogito-trusty-infinispan](https://quay.io/kiegroup/kogito-trusty-infinispan) -* [quay.io/kiegroup/kogito-trusty-redis](https://quay.io/kiegroup/kogito-trusty-redis) -* [quay.io/kiegroup/kogito-trusty-postgresql](https://quay.io/kiegroup/kogito-trusty-postgresql) -* [quay.io/kiegroup/kogito-explainability](https://quay.io/kiegroup/kogito-explainability) * [quay.io/kiegroup/kogito-jobs-service-ephemeral](https://quay.io/kiegroup/kogito-jobs-service-ephemeral) -* [quay.io/kiegroup/kogito-jobs-service-infinispan](https://quay.io/kiegroup/kogito-jobs-service-infinispan) -* [quay.io/kiegroup/kogito-jobs-service-mongodb](https://quay.io/kiegroup/kogito-jobs-service-mongodb) * [quay.io/kiegroup/kogito-jobs-service-postgresql](https://quay.io/kiegroup/kogito-jobs-service-postgresql) * [quay.io/kiegroup/kogito-jobs-service-allinone](https://quay.io/kiegroup/kogito-jobs-service-allinone) * [quay.io/kiegroup/kogito-management-console](https://quay.io/kiegroup/kogito-management-console) * [quay.io/kiegroup/kogito-task-console](https://quay.io/kiegroup/kogito-task-console) -* [quay.io/kiegroup/kogito-trusty-ui](https://quay.io/kiegroup/kogito-trusty-ui) * [quay.io/kiegroup/kogito-jit-runner](https://quay.io/kiegroup/kogito-jit-runner) @@ -630,41 +618,16 @@ For more information please visit this (link)(https://docs.jboss.org/kogito/rele The Data Index Service depends on a running Infinispan, MongoDB or PostgreSQL. The Persistence service can be switched by using its corresponding image -- Infinispan: quay.io/kiegroup/kogito-data-index-infinispan - [image.yaml](kogito-data-index-infinispan-image.yaml) - Ephemeral PostgreSQL: quay.io/kiegroup/kogito-data-index-ephemeral [image.yaml](kogito-data-index-ephemeral-image.yaml) -- Mongodb: quay.io/kiegroup/kogito-data-index-mongodb - [image.yaml](kogito-data-index-mongodb-image.yaml) -- Oracle: quay.io/kiegroup/kogito-data-index-oracle - [image.yaml](kogito-data-index-oracle-image.yaml) - PostgreSQL: quay.io/kiegroup/kogito-data-index-postgresql [image.yaml](kogito-data-index-postgresql-image.yaml) - -Basic usage with Infinispan: -```bash -$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest -``` - Basic usage with Ephemeral PostgreSQL: ```bash $ docker run -it quay.io/kiegroup/kogito-data-index-ephemeral:latest ``` -Basic usage with Mongodb: -```bash -$ docker run -it --env QUARKUS_MONGODB_CONNECTION_STRING=mongodb://localhost:27017 quay.io/kiegroup/kogito-data-index-mongodb:latest -``` - -Basic usage with Oracle: -```bash -$ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:oracle:thin://localhost:1521/kogito" \ - --env QUARKUS_DATASOURCE_USERNAME="kogito" \ - --env QUARKUS_DATASOURCE_PASSWORD="secret" \ - quay.io/kiegroup/kogito-data-index-oracle:latest -``` - Basic usage with PostgreSQL: ```bash $ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus" \ @@ -676,7 +639,7 @@ $ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost: To enable debug just use this env while running this image: ```bash -$ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-infinispan:latest +$ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-data-index-postgresql:latest ``` You should notice a few debug messages present in the system output. @@ -684,71 +647,6 @@ You should notice a few debug messages present in the system output. The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Data Index Service to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. -### Kogito Explainability Component Image - -The Explainability Service aims to provide explainability on the decisions that have been taken by kogito runtime applications. - -Basic usage -```bash -$ docker run -it quay.io/kiegroup/kogito-explainability:latest -``` - -To enable debug just use this env while running this image: - -```bash -docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-explainability:latest -``` -You should notice a few debug messages being printed in the system output. - -To know what configurations this image accepts please take a look [here](kogito-explainability-image.yaml) on the **envs** section. - -The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Explainability Service -to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. - - -### Kogito Trusty Component Image - -The Trusty Service aims at collecting tracing information by one or more Kogito runtime services and provides analytical capabilities on top of the collected data. -The Trusty Service depends on a running Infinispan, Redis Server or PostgreSQL RDBMS. -The Trusty service can be switched by using its corresponding image - -- Infinispan: quay.io/kiegroup/kogito-trusty-infinispan - [image.yaml](kogito-trusty-infinispan-image.yaml) -- Redis: quay.io/kiegroup/kogito-trusty-redis - [image.yaml](kogito-trusty-redis-image.yaml) -- PostgreSQL: quay.io/kiegroup/kogito-trusty-postgresql - [image.yaml](kogito-trusty-postgresql-image.yaml) - -Basic usage with Infinispan: -```bash -$ docker run -it --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty-infinispan:latest -``` - -Basic usage with Redis: -```bash -$ docker run -it --env KOGITO_PERSISTENCE_REDIS_URL=redis://localhost:6379 quay.io/kiegroup/kogito-trusty-redis:latest -``` - -Basic usage with PostgreSQL: -```bash -$ docker run -it --env QUARKUS_DATASOURCE_JDBC_URL="jdbc:postgresql://localhost:5432/quarkus" \ - --env QUARKUS_DATASOURCE_USERNAME="kogito" \ - --env QUARKUS_DATASOURCE_PASSWORD="secret" \ - quay.io/kiegroup/kogito-trusty-postgresql:latest -``` - -To enable debug just use this env while running this image: - -```bash -docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=my-infinispan-server:11222 quay.io/kiegroup/kogito-trusty:latest -``` -You should notice a few debug messages being printed in the system output. - -To know what configurations this image accepts please take a look [here](kogito-trusty-image.yaml) on the **envs** section. - -The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Trusty Service -to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. - ### Kogito Jobs Service Component Images The Kogito Jobs Service is a dedicated lightweight service responsible for scheduling jobs that aim at firing at a given time. @@ -759,8 +657,6 @@ For more information please visit this [link](https://github.com/apache/incubato Today, the Jobs service contains four images: - [ephemeral](kogito-jobs-service-ephemeral-image.yaml) -- [infinispan](kogito-jobs-service-infinispan-image.yaml) -- [mongodb](kogito-jobs-service-mongodb-image.yaml) - [postgresql](kogito-jobs-service-postgresql-image.yaml) - [all-in-one](kogito-jobs-service-allinone-image.yaml) @@ -773,7 +669,7 @@ $ docker run -it quay.io/kiegroup/kogito-jobs-service-ephemeral:latest To enable debug on the Jobs Service images, set the ` SCRIPT_DEBUG` to `true`, example: ```bash -docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-infinispan:latest +docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jobs-service-postgresql:latest ``` You should notice a few debug messages being printed in the system output. @@ -877,31 +773,6 @@ To know what configurations this image accepts please take a look [here](kogito- The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Task Console to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. -### Kogito Trusty UI Component Image - -The Kogito Trusty UI provides an audit tool that allows you to retrieve and inspect the decisions that have been taken by Kogito Runtime Services. -It depends on the Kogito Trusty Service on which the Trusty UI will connect to so it can be able to retrieve the information to display. - -To work correctly, the Kogito Trusty UI needs the Kogito Trusty Service url. If not provided, it will try to connect to the default one (http://localhost:8180). - -Basic usage: - -```bash -$ docker run -it --env KOGITO_TRUSTY_ENDPOINT=trusty-service-url:9090 quay.io/kiegroup/kogito-trusty-ui:latest -``` - -To enable debug just use this env while running this image: - -```bash -docker run -it --env SCRIPT_DEBUG=true --env KOGITO_TRUSTY_ENDPOINT=trusty-service-url:9090 quay.io/kiegroup/kogito-trusty-ui:latest -``` -You should notice a few debug messages being printed in the system output. - -To know what configurations this image accepts please take a look [here](kogito-trusty-ui-image.yaml) on the **envs** section. - -The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Trusty UI -to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. - ### Kogito JIT Runner Component Image The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/apache/incubator-kie-kogito-apps/tree/main/jitexecutor). @@ -951,16 +822,9 @@ $ oc create -f https://raw.githubusercontent.com/apache/incubator-kie-kogito-ima imagestream.image.openshift.io/kogito-runtime-native created imagestream.image.openshift.io/kogito-runtime-jvm created imagestream.image.openshift.io/kogito-s2i-builder created -imagestream.image.openshift.io/kogito-data-index-infinispan created imagestream.image.openshift.io/kogito-data-index-ephemeral created -imagestream.image.openshift.io/kogito-data-index-mongodb created imagestream.image.openshift.io/kogito-data-index-postgresql created -imagestream.image.openshift.io/kogito-trusty-infinispan created -imagestream.image.openshift.io/kogito-trusty-redis created -imagestream.image.openshift.io/kogito-trusty-postgresql created imagestream.image.openshift.io/kogito-jobs-service-ephemeral created -imagestream.image.openshift.io/kogito-jobs-service-infinispan created -imagestream.image.openshift.io/kogito-jobs-service-mongodb created imagestream.image.openshift.io/kogito-jobs-service-postgresql created imagestream.image.openshift.io/kogito-jobs-service-allinone created imagestream.image.openshift.io/kogito-management-console created @@ -1145,22 +1009,12 @@ With this Makefile you can: $ make build-image image_name=kogito-s2i-builder $ make build-image image_name=kogito-runtime-jvm-ubi8 $ make build-image image_name=kogito-runtime-native - $ make build-image image_name=kogito-data-index-infinispan $ make build-image image_name=kogito-data-index-ephemeral - $ make build-image image_name=kogito-data-index-mongodb - $ make build-image image_name=kogito-data-index-oracle $ make build-image image_name=kogito-data-index-postgresql - $ make build-image image_name=kogito-trusty-infinispan - $ make build-image image_name=kogito-trusty-redis - $ make build-image image_name=kogito-trusty-postgresql - $ make build-image image_name=kogito-explainability $ make build-image image_name=kogito-jobs-service-ephemeral - $ make build-image image_name=kogito-jobs-service-infinispan - $ make build-image image_name=kogito-jobs-service-mongodb $ make build-image image_name=kogito-jobs-service-postgresql $ make build-image image_name=kogito-jobs-service-allinone $ make build-image image_name=kogito-management-console - $ make build-image image_name=kogito-trusty-ui $ make build-image image_name=kogito-jit-runner ``` @@ -1217,30 +1071,20 @@ To better understand the CeKit Modules, please visit this [link](https://docs.ce Below you can find all modules used to build the Kogito Images - [kogito-data-index-common](modules/kogito-data-index-common): Data Index common module. -- [kogito-data-index-infinispan](modules/kogito-data-index-infinispan): Installs and Configure the infinispan data-index jar inside the image. - [kogito-data-index-ephemeral](modules/kogito-data-index-ephemeral): Installs and Configure the ephemeral PostgreSQL data-index jar inside the image. -- [kogito-data-index-mongodb](modules/kogito-data-index-mongodb): Installs and Configure the mongodb data-index jar inside the image. -- [kogito-data-index-oracle](modules/kogito-data-index-oracle): Installs and Configure the Oracle data-index jar inside the image. - [kogito-data-index-postgresql](modules/kogito-data-index-postgresql): Installs and Configure the PostgreSQL data-index jar inside the image. -- [kogito-trusty-infinispan](modules/kogito-trusty-infinispan): Installs and Configure the infinispan trusty jar inside the image. -- [kogito-trusty-redis](modules/kogito-trusty-redis): Installs and Configure the redis trusty jar inside the image. -- [kogito-trusty-postgresql](modules/kogito-trusty-postgresql): Installs and Configure the PostgreSQL trusty jar inside the image. -- [kogito-explainability](modules/kogito-explainability): Installs and Configure the explainability jar inside the image. - [kogito-epel](modules/kogito-epel): Configures the epel repository on the target image. - [kogito-graalvm-installer](modules/kogito-graalvm-installer): Installs the GraalVM on the target Image. - [kogito-graalvm-scripts](modules/kogito-graalvm-scripts): Configures the GraalVM on the target image and provides custom configuration script. - [kogito-image-dependencies](modules/kogito-image-dependencies): Installs rpm packages on the target image. Contains common dependencies for Kogito Images. - [kogito-jobs-service-common](modules/kogito-jobs-service-common): Job service common module - [kogito-jobs-service-ephemeral](modules/kogito-jobs-service-ephemeral): Installs and Configure the in-memory jobs-service jar inside the image -- [kogito-jobs-service-infinispan](modules/kogito-jobs-service-infinispan): Installs and Configure the infinispan jobs-service jar inside the image -- [kogito-jobs-service-mongodb](modules/kogito-jobs-service-mongodb): Installs and Configure the mongodb jobs-service jar inside the image - [kogito-jobs-service-postgresql](modules/kogito-jobs-service-postgresql): Installs and Configure the postgresql jobs-service jar inside the image - [kogito-jobs-service-allinone](modules/kogito-jobs-service-all-in-one): Provides the runner script that supports all jobs-service flavors - [kogito-kubernetes-client](modules/kogito-kubernetes-client): Provides a simple wrapper to interact with Kubernetes API. - [kogito-launch-scripts](modules/kogito-launch-scripts): Main script for all images, it contains the startup script for Kogito Images - [kogito-logging](modules/kogito-logging): Provides common logging functions. - [kogito-management-console](modules/kogito-management-console): Installs and Configure the management-console jar inside the image -- [kogito-trusty-ui](modules/kogito-trusty-ui): Installs and Configure the trusty-ui jar inside the image - [kogito-jit-runner](modules/kogito-jit-runner): Installs and Configure the jit-runner jar inside the image - [kogito-maven](modules/kogito-maven): Installs and configure Maven on the S2I images, also provides custom configuration script. - [kogito-openjdk](modules/kogito-openjdk): Provides OpenJDK and JRE. @@ -1254,22 +1098,12 @@ Below you can find all modules used to build the Kogito Images For each image, we use a specific *-image.yaml file. Please inspect the image files to learn which modules are being installed on each image: -- [quay.io/kiegroup/kogito-data-index-infinispan](kogito-data-index-infinispan-image.yaml) - [quay.io/kiegroup/kogito-data-index-ephemeral](kogito-data-index-ephemeral-image.yaml) -- [quay.io/kiegroup/kogito-data-index-mongodb](kogito-data-index-mongodb-image.yaml) -- [quay.io/kiegroup/kogito-data-index-oracle](kogito-data-index-oracle-image.yaml) - [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml) -- [quay.io/kiegroup/kogito-trusty-infinispan](kogito-trusty-infinispan-image.yaml) -- [quay.io/kiegroup/kogito-trusty-redis](kogito-trusty-redis-image.yaml) -- [quay.io/kiegroup/kogito-trusty-postgresql](kogito-trusty-postgresql-image.yaml) -- [quay.io/kiegroup/kogito-explainability](kogito-explainability-image.yaml) - [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml) -- [quay.io/kiegroup/kogito-jobs-service-infinispan](kogito-jobs-service-infinispan-image.yaml) -- [quay.io/kiegroup/kogito-jobs-service-mongodb](kogito-jobs-service-mongodb-image.yaml) - [quay.io/kiegroup/kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml) - [quay.io/kiegroup/kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml) - [quay.io/kiegroup/kogito-management-console](kogito-management-console-image.yaml) -- [quay.io/kiegroup/kogito-trusty-ui](kogito-trusty-ui-image.yaml) - [quay.io/kiegroup/kogito-jit-runner](kogito-jit-runner-image.yaml) - [quay.io/kiegroup/kogito-runtime-jvm](kogito-runtime-jvm-image.yaml) - [quay.io/kiegroup/kogito-runtime-native](kogito-runtime-native-image.yaml) @@ -1372,8 +1206,8 @@ For example, if we are creating a new image called quay.io/kiegroup/kogito-moon- example: ```text -@quay.io/kiegroup/kogito-data-index-infinispan -Feature: Kogito-data-index-infinispan feature. +@quay.io/kiegroup/kogito-data-index-postgresql +Feature: Kogito-data-index-postgresql feature. ... Scenarios...... ``` diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml deleted file mode 100644 index 56670c8a2..000000000 --- a/kogito-data-index-infinispan-image.yaml +++ /dev/null @@ -1,89 +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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-data-index-infinispan" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Data Index Service for Infinispan persistence provider" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Data Index Service for Infinispan persistence provider" - - name: "io.k8s.display-name" - value: "Kogito Data Index Service - Infinispan" - - name: "io.openshift.tags" - value: "kogito,data-index,data-index-infinispan" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - - name: "QUARKUS_INFINISPAN_CLIENT_HOSTS" - example: "172.18.0.1:11222" - description: "Sets the host name/port to connect to. Each one is separated by a semicolon (eg. host1:11222;host2:11222)." - - name: "QUARKUS_INFINISPAN_CLIENT_USE_AUTH" - example: "true" - description: "Enables or disables authentication" - - name: "QUARKUS_INFINISPAN_CLIENT_USERNAME" - example: "myUsername" - description: "Sets user name used by authentication" - - name: "QUARKUS_INFINISPAN_CLIENT_PASSWORD" - example: "hard2guess" - description: "Sets password used by authentication" - - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_REALM" - example: "SecretRealm" - description: "Sets realm used by authentication" - - name: "QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM" - example: "COOLGSSAPI" - description: "Sets SASL mechanism used by authentication" - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.dataindex.infinispan - - name: org.kie.kogito.dataindex.common - - name: org.kie.kogito.security.custom.truststores - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" - diff --git a/kogito-data-index-mongodb-image.yaml b/kogito-data-index-mongodb-image.yaml deleted file mode 100644 index efff5ff3c..000000000 --- a/kogito-data-index-mongodb-image.yaml +++ /dev/null @@ -1,71 +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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-data-index-mongodb" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Data Index Service for Mongodb persistence provider" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Data Index Service for Mongodb persistence provider" - - name: "io.k8s.display-name" - value: "Kogito Data Index Service - Mongodb" - - name: "io.openshift.tags" - value: "kogito,data-index,data-index-mongodb" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.dataindex.mongodb - - name: org.kie.kogito.dataindex.common - - name: org.kie.kogito.security.custom.truststores - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" - diff --git a/kogito-data-index-oracle-image.yaml b/kogito-data-index-oracle-image.yaml deleted file mode 100644 index be1851f64..000000000 --- a/kogito-data-index-oracle-image.yaml +++ /dev/null @@ -1,71 +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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-data-index-oracle" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Data Index Service for Oracle persistence provider" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Data Index Service for Oracle persistence provider" - - name: "io.k8s.display-name" - value: "Kogito Data Index Service - Oracle" - - name: "io.openshift.tags" - value: "kogito,data-index,data-index-oracle" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.dataindex.oracle - - name: org.kie.kogito.dataindex.common - - name: org.kie.kogito.security.custom.truststores - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" - diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml deleted file mode 100644 index 102506fda..000000000 --- a/kogito-explainability-image.yaml +++ /dev/null @@ -1,73 +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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-explainability" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Explainability Service" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Explainability Service" - - name: "io.k8s.display-name" - value: "Kogito Explainability Service" - - name: "io.openshift.tags" - value: "kogito,explainability" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - - name: "EXPLAINABILITY_COMMUNICATION" - example: "REST" - description: "Defines which kind of communication should be used by the Explainability Container: rest api or kafka events." - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.explainability - - name: org.kie.kogito.security.custom.truststores - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" - diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml index a5edcf3d8..139458273 100644 --- a/kogito-imagestream.yaml +++ b/kogito-imagestream.yaml @@ -129,27 +129,6 @@ items: from: kind: DockerImage name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT - - kind: ImageStream - apiVersion: v1 - metadata: - name: kogito-data-index-infinispan - annotations: - openshift.io/display-name: Runtime image for the Kogito Data Index Service for Infinispan persistence provider - openshift.io/provider-display-name: Kie Group. - spec: - tags: - - name: '999-SNAPSHOT' - annotations: - description: Runtime image for the Kogito Data Index Service with Infinispan - iconClass: icon-jbpm - tags: kogito,data-index,data-index-infinispan - supports: persistence backed by Infinispan Server - version: '999-SNAPSHOT' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-data-index-infinispan:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -171,27 +150,6 @@ items: from: kind: DockerImage name: quay.io/kiegroup/kogito-data-index-ephemeral:999-SNAPSHOT - - kind: ImageStream - apiVersion: v1 - metadata: - name: kogito-data-index-mongodb - annotations: - openshift.io/display-name: Runtime image for the Kogito Data Index Service for MongoDB persistence provider - openshift.io/provider-display-name: Kie Group. - spec: - tags: - - name: '999-SNAPSHOT' - annotations: - description: Runtime image for the Kogito Data Index Service with Mongodb - iconClass: icon-jbpm - tags: kogito,data-index,data-index-mongodb - supports: persistence backed by Mongodb server - version: '999-SNAPSHOT' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-data-index-mongodb:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -213,90 +171,6 @@ items: from: kind: DockerImage name: quay.io/kiegroup/kogito-data-index-postgresql:999-SNAPSHOT - - kind: ImageStream - apiVersion: v1 - metadata: - name: kogito-trusty-infinispan - annotations: - openshift.io/display-name: Runtime image for the Kogito Trusty Service for Infinispan persistence provider - openshift.io/provider-display-name: Kie Group. - spec: - tags: - - name: '999-SNAPSHOT' - annotations: - description: Runtime image for the Kogito Trusty Service with Infinispan - iconClass: icon-jbpm - tags: kogito,trusty,trusty-infinispan - supports: persistence backed by Infinispan server - version: '999-SNAPSHOT' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-trusty-infinispan:999-SNAPSHOT - - kind: ImageStream - apiVersion: v1 - metadata: - name: kogito-trusty-redis - annotations: - openshift.io/display-name: Runtime image for the Kogito Trusty Service for Redis persistence provider - openshift.io/provider-display-name: Kie Group. - spec: - tags: - - name: '999-SNAPSHOT' - annotations: - description: Runtime image for the Kogito Trusty Service with Redis - iconClass: icon-jbpm - tags: kogito,trusty,trusty-redis - supports: persistence backed by Redis server - version: '999-SNAPSHOT' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-trusty-redis:999-SNAPSHOT - - kind: ImageStream - apiVersion: v1 - metadata: - name: kogito-trusty-postgresql - annotations: - openshift.io/display-name: Runtime image for the Kogito Trusty Service for PostgreSQL persistence provider - openshift.io/provider-display-name: Kie Group. - spec: - tags: - - name: '999-SNAPSHOT' - annotations: - description: Runtime image for the Kogito Trusty Service with PostgreSQL - iconClass: icon-jbpm - tags: kogito,trusty,trusty-postgresql - supports: persistence backed by PostgreSQL RDBMS - version: '999-SNAPSHOT' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-trusty-postgresql:999-SNAPSHOT - - kind: ImageStream - apiVersion: v1 - metadata: - name: kogito-trusty-ui - annotations: - openshift.io/display-name: Runtime image for the Kogito Trusty UI Service - openshift.io/provider-display-name: Kie Group. - spec: - tags: - - name: '999-SNAPSHOT' - annotations: - description: Runtime image for the Kogito Trusty UI Service - iconClass: icon-jbpm - tags: kogito,trusty-ui - supports: Audit UI - version: '999-SNAPSHOT' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-trusty-ui:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -318,27 +192,6 @@ items: from: kind: DockerImage name: quay.io/kiegroup/kogito-jit-runner:999-SNAPSHOT - - kind: ImageStream - apiVersion: v1 - metadata: - name: kogito-explainability - annotations: - openshift.io/display-name: Runtime image for the Kogito Explainability Service - openshift.io/provider-display-name: Kie Group. - spec: - tags: - - name: '999-SNAPSHOT' - annotations: - description: Runtime image for the Kogito Explainability Service - iconClass: icon-jbpm - tags: kogito,explainability - supports: explainability for decisions - version: '999-SNAPSHOT' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-explainability:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -360,48 +213,6 @@ items: from: kind: DockerImage name: quay.io/kiegroup/kogito-jobs-service-ephemeral:999-SNAPSHOT - - kind: ImageStream - apiVersion: v1 - metadata: - name: kogito-jobs-service-infinispan - annotations: - openshift.io/display-name: Runtime image for Kogito Jobs Service based on Infinispan - openshift.io/provider-display-name: Kie Group. - spec: - tags: - - name: '999-SNAPSHOT' - annotations: - description: Runtime image for Kogito Jobs Service based on Infinispan - iconClass: icon-jbpm - tags: kogito,jobs-service - supports: out-of-box process timers - version: '999-SNAPSHOT' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-infinispan:999-SNAPSHOT - - kind: ImageStream - apiVersion: v1 - metadata: - name: kogito-jobs-service-mongodb - annotations: - openshift.io/display-name: Runtime image for Kogito Jobs Service based on Mongodb - openshift.io/provider-display-name: Kie Group. - spec: - tags: - - name: '999-SNAPSHOT' - annotations: - description: Runtime image for Kogito Jobs Service based on Mongodb - iconClass: icon-jbpm - tags: kogito,jobs-service - supports: out-of-box process timers - version: '999-SNAPSHOT' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-mongodb:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml deleted file mode 100644 index 52590018c..000000000 --- a/kogito-jobs-service-infinispan-image.yaml +++ /dev/null @@ -1,73 +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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-jobs-service-infinispan" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Jobs Service based on Infinispan" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Jobs Service based on Infinispan" - - name: "io.k8s.display-name" - value: "Kogito Jobs Service based on Infinispan" - - name: "io.openshift.tags" - value: "kogito,jobs-service-infinispan" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - - name: "ENABLE_EVENTS" - example: "true" - description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on." - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.jobs.service.infinispan - - name: org.kie.kogito.security.custom.truststores - - name: org.kie.kogito.jobs.service.common - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" diff --git a/kogito-jobs-service-mongodb-image.yaml b/kogito-jobs-service-mongodb-image.yaml deleted file mode 100644 index 5c54b8297..000000000 --- a/kogito-jobs-service-mongodb-image.yaml +++ /dev/null @@ -1,73 +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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-jobs-service-mongodb" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Jobs Service based on MongoDB" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Jobs Service based on MongoDB" - - name: "io.k8s.display-name" - value: "Kogito Jobs Service based on MongoDB" - - name: "io.openshift.tags" - value: "kogito,jobs-service-mongodb" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - - name: "ENABLE_EVENTS" - example: "true" - description: "By default Jobs Service doesn't integrate with message systems (e.g. Kafka). Set this variable to true to enable the events add-on." - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.jobs.service.mongodb - - name: org.kie.kogito.security.custom.truststores - - name: org.kie.kogito.jobs.service.common - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml deleted file mode 100644 index 3edb2f6e2..000000000 --- a/kogito-trusty-infinispan-image.yaml +++ /dev/null @@ -1,89 +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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-trusty-infinispan" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Trusty Service for Infinispan persistence provider" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Trusty Service for Infinispan persistence provider" - - name: "io.k8s.display-name" - value: "Kogito Trusty Service - Infinispan" - - name: "io.openshift.tags" - value: "kogito,trusty,trusty-infinispan" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - - name: "QUARKUS_INFINISPAN_CLIENT_HOSTS" - example: "172.18.0.1:11222" - description: "Sets the host name/port to connect to. Each one is separated by a semicolon (eg. host1:11222;host2:11222)." - - name: "QUARKUS_INFINISPAN_CLIENT_USE_AUTH" - example: "true" - description: "Enables or disables authentication" - - name: "QUARKUS_INFINISPAN_CLIENT_USERNAME" - example: "myUsername" - description: "Sets user name used by authentication" - - name: "QUARKUS_INFINISPAN_CLIENT_PASSWORD" - example: "hard2guess" - description: "Sets password used by authentication" - - name: "QUARKUS_INFINISPAN_CLIENT_AUTH_REALM" - example: "SecretRealm" - description: "Sets realm used by authentication" - - name: "QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM" - example: "COOLGSSAPI" - description: "Sets SASL mechanism used by authentication" - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.trusty.infinispan - - name: org.kie.kogito.trusty.common - - name: org.kie.kogito.security.custom.truststores - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" - diff --git a/kogito-trusty-postgresql-image.yaml b/kogito-trusty-postgresql-image.yaml deleted file mode 100644 index 4e206e43d..000000000 --- a/kogito-trusty-postgresql-image.yaml +++ /dev/null @@ -1,71 +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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-trusty-postgresql" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider" - - name: "io.k8s.display-name" - value: "Kogito Trusty Service - PostgreSQL" - - name: "io.openshift.tags" - value: "kogito,trusty,trusty-postgresql" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.trusty.postgresql - - name: org.kie.kogito.trusty.common - - name: org.kie.kogito.security.custom.truststores - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" - diff --git a/kogito-trusty-redis-image.yaml b/kogito-trusty-redis-image.yaml deleted file mode 100644 index 8ca552927..000000000 --- a/kogito-trusty-redis-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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-trusty-redis" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Trusty Service for Redis persistence provider" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Trusty Service for Redis persistence provider" - - name: "io.k8s.display-name" - value: "Kogito Trusty Service - Redis" - - name: "io.openshift.tags" - value: "kogito,trusty,trusty-redis" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - - name: "KOGITO_PERSISTENCE_REDIS_URL" - example: "http://localhost:6379" - description: "The URL of the RediSearch cluster." - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.trusty.redis - - name: org.kie.kogito.trusty.common - - name: org.kie.kogito.security.custom.truststores - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" - diff --git a/kogito-trusty-ui-image.yaml b/kogito-trusty-ui-image.yaml deleted file mode 100644 index fc6a2ed52..000000000 --- a/kogito-trusty-ui-image.yaml +++ /dev/null @@ -1,72 +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. -# -schema_version: 1 - -name: "quay.io/kiegroup/kogito-trusty-ui" -version: "999-SNAPSHOT" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Trusty UI" - -labels: - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Runtime image for Kogito Trusty UI, manage your Business Process easily." - - name: "io.k8s.display-name" - value: "Kogito Trusty UI" - - name: "io.openshift.tags" - value: "kogito,trusty,trusty-ui" - - name: "io.openshift.expose-services" - value: "8080:http" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - - name: "KOGITO_TRUSTY_ENDPOINT" - example: "http://trusty.service:8080" - description: "Trusty service address, defaults to http://localhost:8180." - -packages: - manager: microdnf - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "17" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.trusty.ui - - name: org.kie.kogito.security.custom.truststores - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml deleted file mode 100644 index 798f5e08e..000000000 --- a/logic-data-index-ephemeral-rhel8-image.yaml +++ /dev/null @@ -1,94 +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. -# -schema_version: 1 - -name: "openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8" -version: "1.30.0" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider" - -labels: -- name: "com.redhat.component" - value: "openshift-serverless-1-logic-data-index-ephemeral-rhel8-container" -- name: "maintainer" - value: "Apache KIE " -- name: "io.k8s.description" - value: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider" -- name: "io.k8s.display-name" - value: "Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL" -- name: "io.openshift.tags" - value: "logic-data-index,kogito,data-index,data-index-ephemeral" -- name: "io.openshift.expose-services" - value: "8080:http" -- name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - -envs: - - name: "SCRIPT_DEBUG" - example: "true" - description: "If set to true, ensures that the bash scripts are executed with the -x option, printing the commands and their arguments as they are executed. Also debug JVM initialization." - - name: "KOGITO_DATA_INDEX_QUARKUS_PROFILE" - value: "http-events-support" - description: "Allows to change the event connection type. The possible values are :`kafka-events-support` or `http-events-support`(default)" - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.openjdk.headless - version: "11" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.dataindex.prod.ephemeral - version: "1.30.0" - - name: org.kie.kogito.dataindex.common - - name: org.kie.kogito.security.custom.truststores - - name: org.kie.kogito.pkg-update - -packages: - manager: microdnf - content_sets_file: content_sets.yaml - -osbs: - configuration: - container: - platforms: - only: - - x86_64 - - aarch64 - - ppc64le - compose: - pulp_repos: true - extra_dir: osbs-extra/logic-data-index-ephemeral-rhel8 - repository: - name: containers/openshift-serverless-1-logic-data-index-ephemeral - branch: openshift-serverless-1.30-rhel-8 - -ports: - - value: 8080 - -run: - workdir: "/home/kogito" - user: 1001 - cmd: - - "/home/kogito/kogito-app-launch.sh" - diff --git a/logic-imagestream.yaml b/logic-imagestream.yaml deleted file mode 100644 index 80ee96c03..000000000 --- a/logic-imagestream.yaml +++ /dev/null @@ -1,89 +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. -# -kind: ImageStreamList -apiVersion: v1 -metadata: - name: openshift-serverless-kogito-image-streams - annotations: - description: ImageStream definitions for Red Hat OpenShift Serverless Logic images - openshift.io/provider-display-name: Kie Group -items: - - kind: ImageStream - apiVersion: v1 - metadata: - name: logic-data-index-ephemeral-rhel8 - annotations: - openshift.io/display-name: Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider - openshift.io/provider-display-name: Kie Group - spec: - tags: - - name: '1.30.0' - annotations: - description: Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL - iconClass: icon-jbpm - tags: logic-data-index,kogito,data-index,data-index-ephemeral - supports: quarkus - version: '1.30.0' - referencePolicy: - type: Local - from: - kind: DockerImage - name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8:1.30.0 - - kind: ImageStream - apiVersion: v1 - metadata: - name: logic-devmode - annotations: - openshift.io/display-name: Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled. - openshift.io/provider-display-name: Kie Group - spec: - tags: - - name: '1.30.0' - annotations: - description: Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled. - iconClass: icon-jbpm - tags: logic,devmode,kogito,kogito,development,serverless,workflow - supports: quarkus - version: '1.30.0' - referencePolicy: - type: Local - from: - kind: DockerImage - name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8:1.30.0 - - kind: ImageStream - apiVersion: v1 - metadata: - name: logic-builder - annotations: - openshift.io/display-name: Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled - openshift.io/provider-display-name: Kie Group - spec: - tags: - - name: '1.30.0' - annotations: - description: Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled - iconClass: icon-jbpm - tags: logic,builder,kogito,workflow,serverless - supports: quarkus - version: '1.30.0' - referencePolicy: - type: Local - from: - kind: DockerImage - name: registry.redhat.io/openshift-serverless-1-tech-preview/logic-swf-builder-rhel8:1.30.0 diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml deleted file mode 100644 index 50c8770bb..000000000 --- a/logic-swf-builder-rhel8-image.yaml +++ /dev/null @@ -1,89 +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. -# -schema_version: 1 -name: "openshift-serverless-1-tech-preview/logic-swf-builder-rhel8" -version: "1.30.0" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Red Hat build of Runtime image for Kogito Serverless Workflow 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: "2.16.7.Final" - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "com.redhat.component" - value: "openshift-serverless-1-logic-swf-builder-rhel8-container" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled" - - name: "io.k8s.display-name" - value: "Red Hat OpenShift Serverless Logic Builder image" - - name: "io.openshift.tags" - value: "logic-swf-builder,kogito,swf-builder" - - name: "io.openshift.expose-services" - value: "8080:http" - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.openjdk - version: "11" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.maven.rpm - version: "3.8" - - name: org.kie.kogito.project.versions - - name: org.kie.kogito.swf.common.scripts - - name: org.kie.kogito.swf.builder.runtime.osl - -run: - workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}" - user: 1001 - -ports: - - value: 8080 - - value: 5005 - -packages: - manager: microdnf - content_sets_file: content_sets.yaml - -osbs: - configuration: - container: - platforms: - only: - - x86_64 - - ppc64le - - aarch64 - compose: - pulp_repos: true - extra_dir: osbs-extra/logic-swf-builder-rhel8 - repository: - name: containers/openshift-serverless-1-logic-swf-builder - branch: openshift-serverless-1.30-rhel-8 diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml deleted file mode 100644 index 1977e8353..000000000 --- a/logic-swf-devmode-rhel8-image.yaml +++ /dev/null @@ -1,88 +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. -# -schema_version: 1 -name: "openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -version: "1.30.0" -description: "Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled" - -labels: - - name: "io.quarkus.platform.version" - value: "2.16.7.Final" - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "io.k8s.description" - value: "Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled." - - name: "io.k8s.display-name" - value: "Red Hat OpenShift Serverless Logic SWF Devmode" - - name: "io.openshift.tags" - value: "logic,devmode,kogito,kogito,development,serverless,workflow" - - name: "io.openshift.expose-services" - value: "8080:http,5005:http" - - name: "com.redhat.component" - value: "openshift-serverless-1-logic-swf-devmode-rhel8-container" - - name: "maintainer" - value: "Apache KIE " - -modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.image.dependencies - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.openjdk - version: "11" - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.maven.rpm - version: "3.8" - - 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.osl - -ports: - - value: 8080 - - value: 5005 - -run: - workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}" - user: 1001 - cmd: - - "/home/kogito/launch/run-app-devmode.sh" - -packages: - manager: microdnf - content_sets_file: content_sets.yaml - -osbs: - configuration: - container: - platforms: - only: - - x86_64 - - ppc64le - - aarch64 - compose: - pulp_repos: true - extra_dir: osbs-extra/logic-swf-devmode-rhel8 - repository: - name: containers/openshift-serverless-1-logic-swf-devmode - branch: openshift-serverless-1.30-rhel-8 diff --git a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh b/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh deleted file mode 100644 index ec77a2569..000000000 --- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-data-index-common.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Djava.library.path="${KOGITO_HOME}"/lib \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar \ No newline at end of file diff --git a/modules/kogito-data-index-infinispan/configure b/modules/kogito-data-index-infinispan/configure deleted file mode 100644 index 3ab6e8d85..000000000 --- a/modules/kogito-data-index-infinispan/configure +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/data-index-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ - -cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh - diff --git a/modules/kogito-data-index-infinispan/module.yaml b/modules/kogito-data-index-infinispan/module.yaml deleted file mode 100644 index ba2ed20da..000000000 --- a/modules/kogito-data-index-infinispan/module.yaml +++ /dev/null @@ -1,31 +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. -# -schema_version: 1 -name: org.kie.kogito.dataindex.infinispan -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/data-index-service-infinispan/data-index-service-infinispan-quarkus-app.zip - name: data-index-service-infinispan-quarkus-app.zip - -execute: - - script: configure - diff --git a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh b/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh deleted file mode 100644 index ec77a2569..000000000 --- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-data-index-common.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Djava.library.path="${KOGITO_HOME}"/lib \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar \ No newline at end of file diff --git a/modules/kogito-data-index-mongodb/configure b/modules/kogito-data-index-mongodb/configure deleted file mode 100644 index cbe1dd397..000000000 --- a/modules/kogito-data-index-mongodb/configure +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/data-index-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ - -cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh - diff --git a/modules/kogito-data-index-mongodb/module.yaml b/modules/kogito-data-index-mongodb/module.yaml deleted file mode 100644 index 447ae7389..000000000 --- a/modules/kogito-data-index-mongodb/module.yaml +++ /dev/null @@ -1,31 +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. -# -schema_version: 1 -name: org.kie.kogito.dataindex.mongodb -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/data-index-service-mongodb/data-index-service-mongodb-quarkus-app.zip - name: data-index-service-mongodb-quarkus-app.zip - -execute: - - script: configure - diff --git a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh b/modules/kogito-data-index-oracle/added/kogito-app-launch.sh deleted file mode 100644 index 8394e808f..000000000 --- a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-data-index-common.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_DATA_INDEX_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Djava.library.path="${KOGITO_HOME}"/lib \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar diff --git a/modules/kogito-data-index-oracle/configure b/modules/kogito-data-index-oracle/configure deleted file mode 100644 index 7ff1cae76..000000000 --- a/modules/kogito-data-index-oracle/configure +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/data-index-service-oracle-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ - -cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh - diff --git a/modules/kogito-data-index-oracle/module.yaml b/modules/kogito-data-index-oracle/module.yaml deleted file mode 100644 index a4ab95bbd..000000000 --- a/modules/kogito-data-index-oracle/module.yaml +++ /dev/null @@ -1,31 +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. -# -schema_version: 1 -name: org.kie.kogito.dataindex.oracle -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/data-index-service-oracle/data-index-service-oracle-quarkus-app.zip - name: data-index-service-oracle-quarkus-app.zip - -execute: - - script: configure - diff --git a/modules/kogito-explainability/added/kogito-app-launch.sh b/modules/kogito-explainability/added/kogito-app-launch.sh deleted file mode 100644 index f838b195e..000000000 --- a/modules/kogito-explainability/added/kogito-app-launch.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-explainability.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Djava.library.path="${KOGITO_HOME}"/lib \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/"${EXPLAINABILITY_SERVICE_COMMUNICATION}"/quarkus-app/quarkus-run.jar \ No newline at end of file diff --git a/modules/kogito-explainability/added/launch/kogito-explainability.sh b/modules/kogito-explainability/added/launch/kogito-explainability.sh deleted file mode 100644 index de30f040c..000000000 --- a/modules/kogito-explainability/added/launch/kogito-explainability.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -function prepareEnv() { - # keep it on alphabetical order - unset EXPLAINABILITY_COMMUNICATION -} - -function configure() { - configure_explainability_jar -} - -function configure_explainability_jar { - local allowed_communication_types=("REST" "MESSAGING") - local communication="MESSAGING" - if [[ ! "${allowed_communication_types[*]}" =~ ${EXPLAINABILITY_COMMUNICATION^^} ]]; then - log_warning "Explainability communication type ${EXPLAINABILITY_COMMUNICATION} is not allowed, the allowed types are [${allowed_communication_types[*]}]. Defaulting to ${communication}." - unset EXPLAINABILITY_COMMUNICATION - - elif [ "x${EXPLAINABILITY_COMMUNICATION}" != "x" ]; then - communication="${EXPLAINABILITY_COMMUNICATION}" - fi - - log_info "Explainability communication is set to ${communication}" - EXPLAINABILITY_SERVICE_COMMUNICATION="${communication,,}" -} diff --git a/modules/kogito-explainability/configure b/modules/kogito-explainability/configure deleted file mode 100644 index fd40b372e..000000000 --- a/modules/kogito-explainability/configure +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/explainability-service-rest-quarkus-app.zip -d "${KOGITO_HOME}"/bin/rest/ -unzip "${SOURCES_DIR}"/explainability-service-messaging-quarkus-app.zip -d "${KOGITO_HOME}"/bin/messaging/ - - -cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/ - -chown -R 1001:0 "${KOGITO_HOME}" -chmod -R ug+rwX "${KOGITO_HOME}" - -cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh - diff --git a/modules/kogito-explainability/module.yaml b/modules/kogito-explainability/module.yaml deleted file mode 100644 index 26dfeb05e..000000000 --- a/modules/kogito-explainability/module.yaml +++ /dev/null @@ -1,32 +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. -# -schema_version: 1 -name: org.kie.kogito.explainability -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/explainability-service-rest/explainability-service-rest-quarkus-app.zip - name: explainability-service-rest-quarkus-app.zip - - path: /tmp/build/explainability-service-messaging/explainability-service-messaging-quarkus-app.zip - name: explainability-service-messaging-quarkus-app.zip - -execute: - - script: configure diff --git a/modules/kogito-explainability/tests/bats/kogito-explainability.bats b/modules/kogito-explainability/tests/bats/kogito-explainability.bats deleted file mode 100644 index d0c856308..000000000 --- a/modules/kogito-explainability/tests/bats/kogito-explainability.bats +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bats -# -# 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. -# - - -export KOGITO_HOME=/tmp/kogito -export HOME="${KOGITO_HOME}" -mkdir -p "${KOGITO_HOME}"/launch -cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/ - -# imports -load $BATS_TEST_DIRNAME/../../added/launch/kogito-explainability.sh - -teardown() { - rm -rf "${KOGITO_HOME}" -} - - -@test "test if the default explainability communication type is correctly set" { - configure_explainability_jar - expected="messaging" - echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}" - [ "${EXPLAINABILITY_SERVICE_COMMUNICATION}" = "${expected}" ] -} - -@test "test if explainability communication service default value is correctly set if a nonsense type is set" { - EXPLAINABILITY_COMMUNICATION="nonsense" - configure_explainability_jar - expected="messaging" - echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}" - [ "${EXPLAINABILITY_SERVICE_COMMUNICATION}" = "${expected}" ] -} - -@test "test if explainability communication service default value s correctly set if set to rest" { - EXPLAINABILITY_COMMUNICATION="rest" - configure_explainability_jar - expected="rest" - echo "result: ${EXPLAINABILITY_SERVICE_JAR} \n expected: ${expected}" - [ "${EXPLAINABILITY_SERVICE_COMMUNICATION}" = "${expected}" ] -} \ No newline at end of file diff --git a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh b/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh deleted file mode 100644 index 43b80d173..000000000 --- a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-jobs-service-common.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/infinispan/quarkus-app/quarkus-run.jar diff --git a/modules/kogito-jobs-service-infinispan/configure b/modules/kogito-jobs-service-infinispan/configure deleted file mode 100644 index 5966a9459..000000000 --- a/modules/kogito-jobs-service-infinispan/configure +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/jobs-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/infinispan - -cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh - - diff --git a/modules/kogito-jobs-service-infinispan/module.yaml b/modules/kogito-jobs-service-infinispan/module.yaml deleted file mode 100644 index abae5a2aa..000000000 --- a/modules/kogito-jobs-service-infinispan/module.yaml +++ /dev/null @@ -1,31 +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. -# -schema_version: 1 -name: org.kie.kogito.jobs.service.infinispan -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/jobs-service-infinispan/jobs-service-infinispan-quarkus-app.zip - name: jobs-service-infinispan-quarkus-app.zip - -execute: - - script: configure - diff --git a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh b/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh deleted file mode 100644 index 8f6f9223a..000000000 --- a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-jobs-service-common.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_JOBS_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/mongodb/quarkus-app/quarkus-run.jar diff --git a/modules/kogito-jobs-service-mongodb/configure b/modules/kogito-jobs-service-mongodb/configure deleted file mode 100644 index 0b3d85b71..000000000 --- a/modules/kogito-jobs-service-mongodb/configure +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/jobs-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/mongodb - -cp "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh - diff --git a/modules/kogito-jobs-service-mongodb/module.yaml b/modules/kogito-jobs-service-mongodb/module.yaml deleted file mode 100644 index 28b6488e5..000000000 --- a/modules/kogito-jobs-service-mongodb/module.yaml +++ /dev/null @@ -1,30 +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. -# -schema_version: 1 -name: org.kie.kogito.jobs.service.mongodb -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/jobs-service-mongodb/jobs-service-mongodb-quarkus-app.zip - name: jobs-service-mongodb-quarkus-app.zip - -execute: - - script: configure diff --git a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh deleted file mode 100644 index 6af4c2a5b..000000000 --- a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh +++ /dev/null @@ -1,272 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#Please keep them in alphabetical order -function prepareEnv() { - unset HTTP_PROXY_HOST - unset HTTP_PROXY_PORT - unset HTTP_PROXY_PASSWORD - unset HTTP_PROXY_USERNAME - unset HTTP_PROXY_NONPROXYHOSTS - unset HTTPS_PROXY - unset MAVEN_DOWNLOAD_OUTPUT - unset MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE - unset MAVEN_MIRROR_URL - unset MAVEN_REPO_ID - unset MAVEN_REPO_LAYOUT - unset MAVEN_REPO_RELEASES_ENABLED - unset MAVEN_REPO_RELEASES_UPDATE_POLICY - unset MAVEN_REPO_RELEASES_CHECKSUM_POLICY - unset MAVEN_REPO_SNAPSHOTS_ENABLED - unset MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY - unset MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY - unset MAVEN_REPO_URL - unset MAVEN_REPOS -} - -function configure() { - log_info "Configure Maven" - - configure_proxy - configure_mirrors - configure_maven_download_output - configure_maven_offline_mode - ignore_maven_self_signed_certificates - set_kogito_maven_repo - add_maven_repo - configureMavenHome - - if [ "${SCRIPT_DEBUG}" = "true" ] ; then - cat "${MAVEN_SETTINGS_PATH}" - fi - - rm -rf *.bak -} - -# When Running on OpenShift with AnyUID the HOME environment variable gets overridden to "/" -# Maven build main fail with this issue Could not create local repository at /.m2/repository -# Set the property maven.home to $KOGITO_HOME so the HOME env is ignored. -function configureMavenHome() { - export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Duser.home=${KOGITO_HOME}" -} - -# insert settings for HTTP proxy into maven settings.xml if supplied -function configure_proxy() { - # prefer old http_proxy_ format for username/password, but - # also allow proxy_ format. - HTTP_PROXY_USERNAME=${HTTP_PROXY_USERNAME:-$PROXY_USERNAME} - HTTP_PROXY_PASSWORD=${HTTP_PROXY_PASSWORD:-$PROXY_PASSWORD} - - proxy=${HTTPS_PROXY:-${https_proxy:-${HTTP_PROXY:-$http_proxy}}} - # if http_proxy_host/port is set, prefer that (oldest mechanism) - # before looking at HTTP(S)_PROXY - proxyhost=${HTTP_PROXY_HOST:-$(echo "${proxy}" | cut -d : -f 1,2)} - proxyport=${HTTP_PROXY_PORT:-$(echo "${proxy}" | cut -d : -f 3)} - - if [ -n "$proxyhost" ]; then - if echo "${proxyhost}" | grep -q -i https://; then - proxyport=${proxyport:-443} - proxyprotocol="https" - else - proxyport=${proxyport:-80} - proxyprotocol="http" - fi - - xml="\ - genproxy\ - true\ - $proxyprotocol\ - $proxyhost\ - $proxyport" - - if [ -n "$HTTP_PROXY_USERNAME" ] && [ -n "$HTTP_PROXY_PASSWORD" ]; then - xml="$xml\ - $HTTP_PROXY_USERNAME\ - $HTTP_PROXY_PASSWORD" - fi - if [ -n "$HTTP_PROXY_NONPROXYHOSTS" ]; then - nonproxyhosts="${HTTP_PROXY_NONPROXYHOSTS//|/\\|}" - xml="$xml\ - $nonproxyhosts" - fi - xml="$xml\ - " - sed -i.bak "s||${xml}|" "${MAVEN_SETTINGS_PATH}" - fi -} - -# insert settings for mirrors/repository managers into settings.xml if supplied -function configure_mirrors() { - if [ -n "$MAVEN_MIRROR_URL" ]; then - xml=" \ - mirror.default\ - $MAVEN_MIRROR_URL\ - external:*\ - " - sed -i.bak "s||$xml|" "${MAVEN_SETTINGS_PATH}" - fi -} - -function configure_maven_download_output() { - if [ "${MAVEN_DOWNLOAD_OUTPUT}" != "true" ]; then - export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} --no-transfer-progress" - fi -} - -function configure_maven_offline_mode() { - if [ "${MAVEN_OFFLINE_MODE}" = "true" ]; then - log_info "Setup Maven offline mode. No artifact will be downloaded !!!" - export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -o" - fi -} - -function ignore_maven_self_signed_certificates() { - if [ "${MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE}" == "true" ]; then - export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Denforcer.skip -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true" - fi -} - -function set_kogito_maven_repo() { - local kogito_maven_repo_url="${DEFAULT_MAVEN_REPO_URL}" - if [ -n "${kogito_maven_repo_url}" ]; then - sed -i.bak "s|https://repository.apache.org/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}" - fi -} - -function add_maven_repo() { - # single remote repository scenario: respect fully qualified url if specified, otherwise find and use service - local single_repo_url="${MAVEN_REPO_URL}" - if [ -n "$single_repo_url" ]; then - single_repo_id=$(_maven_find_env "MAVEN_REPO_ID" "repo-$(_generate_random_id)") - _add_maven_repo "$single_repo_url" "$single_repo_id" "" - fi - - # multiple remote repositories scenario: respect fully qualified url(s) if specified, otherwise find and use service(s); can be used together with "single repo scenario" above - local multi_repo_counter=1 - IFS=',' read -r -a multi_repo_prefixes <<<"${MAVEN_REPOS}" - for multi_repo_prefix in "${multi_repo_prefixes[@]}"; do - multi_repo_url=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_URL") - multi_repo_id=$(_maven_find_prefixed_env "${multi_repo_prefix}" "MAVEN_REPO_ID" "repo${multi_repo_counter}-$(_generate_random_id)") - _add_maven_repo "$multi_repo_url" "$multi_repo_id" "$multi_repo_prefix" - multi_repo_counter=$((multi_repo_counter + 1)) - done -} -# add maven repositories -# Parameters: -# $1 - repo url -# $2 - repo id -# $3 - repo prefix -function _add_maven_repo() { - local repo_url=$1 - local repo_id=$2 - local prefix=$3 - - repo_name=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_NAME" "${repo_id}") - repo_layout=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_LAYOUT" "default") - releases_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_ENABLED" "true") - releases_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_UPDATE_POLICY" "always") - releases_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" "warn") - snapshots_enabled=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_ENABLED" "true") - snapshots_update_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" "always") - snapshots_checksum_policy=$(_maven_find_prefixed_env "${prefix}" "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" "warn") - - local repo="\n\ - \n\ - ${repo_id}\n\ - ${repo_name}\n\ - ${repo_url}\n\ - ${repo_layout}\n\ - \n\ - ${releases_enabled}\n\ - ${releases_update_policy}\n\ - ${releases_checksum_policy}\n\ - \n\ - \n\ - ${snapshots_enabled}\n\ - ${snapshots_update_policy}\n\ - ${snapshots_checksum_policy}\n\ - \n\ - \n\ - " - sed -i.bak "s||${repo}|" "${MAVEN_SETTINGS_PATH}" - - local pluginRepo="\n\ - \n\ - ${repo_id}\n\ - ${repo_name}\n\ - ${repo_url}\n\ - ${repo_layout}\n\ - \n\ - ${releases_enabled}\n\ - ${releases_update_policy}\n\ - ${releases_checksum_policy}\n\ - \n\ - \n\ - ${snapshots_enabled}\n\ - ${snapshots_update_policy}\n\ - ${snapshots_checksum_policy}\n\ - \n\ - \n\ - " - - sed -i.bak "s||${pluginRepo}|" "${MAVEN_SETTINGS_PATH}" - - # new repo should be skipped by mirror if exists - sed -i.bak "s||,!${repo_id}|g" "${MAVEN_SETTINGS_PATH}" -} - -# Finds the environment variable and returns its value if found. -# Otherwise returns the default value if provided. -# -# Arguments: -# $1 env variable name to check -# $2 default value if environment variable was not set -function _maven_find_env() { - local var=${!1} - echo "${var:-$2}" -} - -# Finds the environment variable with the given prefix. If not found -# the default value will be returned. If no prefix is provided will -# rely on _maven_find_env -# -# Arguments -# - $1 prefix. Transformed to uppercase and replace - by _ -# - $2 variable name. Prepended by "prefix_" -# - $3 default value if the variable is not defined -function _maven_find_prefixed_env() { - local prefix=$1 - - if [[ -z $prefix ]]; then - _maven_find_env "${2}" "${3}" - else - prefix=${prefix^^} # uppercase - prefix=${prefix//-/_} #replace - by _ - - local var_name="${prefix}_${2}" - echo "${!var_name:-${3}}" - fi -} - -# private -function _generate_random_id() { - env LC_CTYPE=C < /dev/urandom tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1 -} diff --git a/modules/kogito-maven/3.8.x-rpm/configure b/modules/kogito-maven/3.8.x-rpm/configure deleted file mode 100644 index ef74352f1..000000000 --- a/modules/kogito-maven/3.8.x-rpm/configure +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") - -mkdir "${KOGITO_HOME}"/.m2 -cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2 -cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/ - -# configure Red Hat repositories on the maven settings.xml for product builds -if [ "${ENABLE_RH_MAVEN_REPO}" == "true" ]; then - echo "enabling red hat repositories" - rh_repos=" \ -\ - redhat-maven-repositories\ - \ - \ - redhat-ga-repository\ - https://maven.repository.redhat.com/ga/\ - \ - true\ - \ - \ - false\ - \ - \ - \ - redhat-ea-repository\ - https://maven.repository.redhat.com/earlyaccess/all/\ - \ - true\ - \ - \ - false\ - \ - \ - \ - redhat-techpreview-repository\ - https://maven.repository.redhat.com/techpreview/all\ - \ - true\ - \ - \ - false\ - \ - \ - \ - \ - \ - redhat-ga-plugin-repository\ - https://maven.repository.redhat.com/ga/\ - \ - true\ - \ - \ - false\ - \ - \ - \ - redhat-ea-plugin-repository\ - https://maven.repository.redhat.com/earlyaccess/all/\ - \ - true\ - \ - \ - false\ - \ - \ - \ - redhat-techpreview-repository\ - https://maven.repository.redhat.com/techpreview/all\ - \ - true\ - \ - \ - false\ - \ - \ - \ -\ -" - sed -i "s||$rh_repos|" "${KOGITO_HOME}"/.m2/settings.xml - sed -i "s||redhat-maven-repositories|" "${KOGITO_HOME}"/.m2/settings.xml - - mv "${KOGITO_HOME}"/.m2/settings.xml "${KOGITO_HOME}"/.m2/settings.xml.bkp - #format and write the new file - xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${KOGITO_HOME}"/.m2/settings.xml -fi diff --git a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml deleted file mode 100644 index bf67912d2..000000000 --- a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - kogito-images - - - apache-public-repository-group - Apache Public Repository Group - https://repository.apache.org/content/groups/public/ - default - - true - never - - - true - always - - - - - - - - apache-public-repository-group - Apache Public Repository Group - https://repository.apache.org/content/groups/public/ - default - - true - never - - - true - always - - - - - - - - - kogito-images - - diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml deleted file mode 100644 index cc5bdf92c..000000000 --- a/modules/kogito-maven/3.8.x-rpm/module.yaml +++ /dev/null @@ -1,103 +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. -# -schema_version: 1 -name: org.kie.kogito.maven.rpm -version: "3.8" - -envs: - - name: "MAVEN_VERSION" - value: "3.8" - - name: "MAVEN_HOME" - value: "/usr/share/maven" - - name: "MAVEN_SETTINGS_PATH" - description: "The location of the settings.xml file" - value: '${KOGITO_HOME}/.m2/settings.xml' - - name: "HTTP_PROXY" - description: "The location of the http proxy, will be used for both Maven builds and Java runtime." - example: "http://127.0.0.1:8080" - - name: "HTTP_PROXY_HOST" - description: "Proxy Host, don't need to be set if HTTP_PROXY is used." - example: "127.0.0.1" - - name: "HTTP_PROXY_PORT" - description: "Proxy Port, don't need to be set if HTTP_PROXY is used." - example: "8181" - - name: "HTTP_PROXY_PASSWORD" - description: "Proxy Password" - - name: "HTTP_PROXY_USERNAME" - description: "Proxy Username" - - name: "HTTP_PROXY_NONPROXYHOSTS" - description: "Non proxy hosts, list of hosts that will ot be proxied." - example: "localhost" - - name: "MAVEN_MIRROR_URL" - description: "The base URL of a mirror used for retrieving artifacts." - example: "http://10.0.0.1:8080/repository/internal/" - - name: "MAVEN_DOWNLOAD_OUTPUT" - description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false" - example: "true" - - name: "DEFAULT_MAVEN_REPO_URL" - value: "https://repository.apache.org/content/groups/public/" - description: "Defines the Default Maven repository for Kogito artifacts." - - name: "MAVEN_REPO_URL" - description: "Defines an extra Maven repository." - example: "https://nexus.test.com/group/public" - - name: "MAVEN_REPO_ID" - description: "Defines the id of the new Repository" - example: "nexus-test" - - name: "MAVEN_REPO_LAYOUT" - description: "The type of layout this repository uses for locating and storing artifacts - can be 'legacy' or 'default'.Defaults to 'default'." - example: "legacy" - - name: "MAVEN_REPO_RELEASES_ENABLED" - description: "Whether to use this repository for downloading this type of artifact. Default value is: true." - example: "false" - - name: "MAVEN_REPO_RELEASES_UPDATE_POLICY" - description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always." - example: "never" - - name: "MAVEN_REPO_RELEASES_CHECKSUM_POLICY" - description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn" - example: "fail" - - name: "MAVEN_REPO_SNAPSHOTS_ENABLED" - description: "Whether to use this repository for downloading this type of artifact. Default value is: true." - example: "false" - - name: "MAVEN_REPO_SNAPSHOTS_UPDATE_POLICY" - description: "The frequency for downloading updates - can be 'always', 'daily', 'interval:XXX' (in minutes) or 'never'. Defaults to always." - example: "never" - - name: "MAVEN_REPO_SNAPSHOTS_CHECKSUM_POLICY" - description: "What to do when verification of an artifact checksum fails - warn, fail, etc. Valid values are 'fail' or 'warn'. Defaults to warn" - example: "fail" - - name: "MAVEN_REPOS" - description: "Used to define multiple repositories, this env defines a prefix that will be used to create different repositories." - example: "CENTRAL,INTERNAL" - - name: "MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE" - description: "When set, use of relaxed SSL check for user generated certificates. Default value is false" - example: "true" - - name: "MAVEN_OFFLINE_MODE" - description: "When set to true, tells Maven to work in offline mode. See Maven `-o` option for more information." - example: "true" - -modules: - install: - - name: org.kie.kogito.maven.dnf.module - -packages: - install: - - maven - - -execute: - - script: configure diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats index 5201654d7..40e71fddf 100644 --- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats +++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats @@ -462,20 +462,6 @@ teardown() { [ "${result}" = "${expected}" ] } - -@test "test if the Quarkus platform properties are correctly returned for prod version" { - QUARKUS_PLATFORM_VERSION="1.2.3.4" - JBOSS_IMAGE_NAME="rhpam-7/kogito-builder" - - result=$(get_quarkus_platform_properties) - - expected=" -DplatformGroupId=com.redhat.quarkus.platform -DplatformArtifactId=quarkus-bom -DplatformVersion=1.2.3.4" - - echo "result : $result" - echo "expected: $expected" - [ "${result}" = "${expected}" ] -} - @test "Check if the expected message is printed if native build is enabled" { QUARKUS_PLATFORM_VERSION="1.2.3.4" JBOSS_IMAGE_NAME="rhpam-7/kogito-builder" diff --git a/modules/kogito-trusty-common/added/launch/kogito-trusty.sh b/modules/kogito-trusty-common/added/launch/kogito-trusty.sh deleted file mode 100644 index a163c81d9..000000000 --- a/modules/kogito-trusty-common/added/launch/kogito-trusty.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -function prepareEnv() { - # keep it on alphabetical order - unset EXPLAINABILITY_ENABLED -} - -function configure() { - enable_explainability -} - - -function enable_explainability { - local allowed_values=("TRUE" "FALSE") - local explainability_enabled="true" - # shellcheck disable=SC2153 - if [[ ! "${allowed_values[*]}" =~ ${EXPLAINABILITY_ENABLED^^} ]]; then - log_warning "Explainability enabled type ${EXPLAINABILITY_ENABLED} is not allowed, the allowed types are [${allowed_values[*]}]. Defaulting to ${explainability_enabled}." - elif [ "${EXPLAINABILITY_ENABLED^^}" == "FALSE" ]; then - explainability_enabled="${EXPLAINABILITY_ENABLED^^}" - fi - log_info "Explainability is enabled: ${explainability_enabled}" - KOGITO_TRUSTY_PROPS="${KOGITO_TRUSTY_PROPS} -Dtrusty.explainability.enabled=${explainability_enabled,,}" -} diff --git a/modules/kogito-trusty-common/configure b/modules/kogito-trusty-common/configure deleted file mode 100644 index a54486162..000000000 --- a/modules/kogito-trusty-common/configure +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added -cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/ - -chown -R 1001:0 "${KOGITO_HOME}" -chmod -R ug+rwX "${KOGITO_HOME}" \ No newline at end of file diff --git a/modules/kogito-trusty-common/module.yaml b/modules/kogito-trusty-common/module.yaml deleted file mode 100644 index 9a7be9b8c..000000000 --- a/modules/kogito-trusty-common/module.yaml +++ /dev/null @@ -1,25 +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. -# -schema_version: 1 -name: org.kie.kogito.trusty.common -version: "999-SNAPSHOT" -description: "Common modules for trusty provider images, any addition that is common must be added in this module" - -execute: - - script: configure diff --git a/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats b/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats deleted file mode 100644 index afa1ffe0a..000000000 --- a/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bats -# -# 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. -# - - -export KOGITO_HOME=/tmp/kogito -export HOME="${KOGITO_HOME}" -mkdir -p "${KOGITO_HOME}"/launch -cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/ - -# imports -load $BATS_TEST_DIRNAME/../../added/launch/kogito-trusty.sh - -teardown() { - rm -rf "${KOGITO_HOME}" -} - -@test "explainability is enabled by default" { - enable_explainability - expected=" -Dtrusty.explainability.enabled=true" - echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}" - [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ] -} - -@test "disable explainability" { - export EXPLAINABILITY_ENABLED="false" - enable_explainability - expected=" -Dtrusty.explainability.enabled=false" - echo "Result is ${KOGITO_TRUSTY_PROPS} and expected is ${expected}" - [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ] -} - -@test "explainability is enabled even if nonsense values are provided" { - EXPLAINABILITY_ENABLED="nonsense" - enable_explainability - expected=" -Dtrusty.explainability.enabled=true" - echo "result: ${KOGITO_TRUSTY_PROPS} \n expected: ${expected}" - [ "${KOGITO_TRUSTY_PROPS}" = "${expected}" ] -} \ No newline at end of file diff --git a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh b/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh deleted file mode 100644 index ab8a34e32..000000000 --- a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-trusty.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Djava.library.path="${KOGITO_HOME}"/lib \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar \ No newline at end of file diff --git a/modules/kogito-trusty-infinispan/configure b/modules/kogito-trusty-infinispan/configure deleted file mode 100644 index 93536c025..000000000 --- a/modules/kogito-trusty-infinispan/configure +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/trusty-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ - -cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh \ No newline at end of file diff --git a/modules/kogito-trusty-infinispan/module.yaml b/modules/kogito-trusty-infinispan/module.yaml deleted file mode 100644 index 316cb95b5..000000000 --- a/modules/kogito-trusty-infinispan/module.yaml +++ /dev/null @@ -1,31 +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. -# -schema_version: 1 -name: org.kie.kogito.trusty.infinispan -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/trusty-service-infinispan/trusty-service-infinispan-quarkus-app.zip - name: trusty-service-infinispan-quarkus-app.zip - -execute: - - script: configure - diff --git a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh b/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh deleted file mode 100644 index ab8a34e32..000000000 --- a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-trusty.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Djava.library.path="${KOGITO_HOME}"/lib \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar \ No newline at end of file diff --git a/modules/kogito-trusty-postgresql/configure b/modules/kogito-trusty-postgresql/configure deleted file mode 100644 index 9cca2a2a8..000000000 --- a/modules/kogito-trusty-postgresql/configure +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/trusty-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ - -cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh \ No newline at end of file diff --git a/modules/kogito-trusty-postgresql/module.yaml b/modules/kogito-trusty-postgresql/module.yaml deleted file mode 100644 index 31fde32f6..000000000 --- a/modules/kogito-trusty-postgresql/module.yaml +++ /dev/null @@ -1,31 +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. -# -schema_version: 1 -name: org.kie.kogito.trusty.postgresql -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/trusty-service-postgresql/trusty-service-postgresql-quarkus-app.zip - name: trusty-service-postgresql-quarkus-app.zip - -execute: - - script: configure - diff --git a/modules/kogito-trusty-redis/added/kogito-app-launch.sh b/modules/kogito-trusty-redis/added/kogito-app-launch.sh deleted file mode 100644 index ab8a34e32..000000000 --- a/modules/kogito-trusty-redis/added/kogito-app-launch.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-trusty.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Djava.library.path="${KOGITO_HOME}"/lib \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar \ No newline at end of file diff --git a/modules/kogito-trusty-redis/configure b/modules/kogito-trusty-redis/configure deleted file mode 100644 index cfb84f93a..000000000 --- a/modules/kogito-trusty-redis/configure +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/trusty-service-redis-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ - -cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh \ No newline at end of file diff --git a/modules/kogito-trusty-redis/module.yaml b/modules/kogito-trusty-redis/module.yaml deleted file mode 100644 index b932b7fdb..000000000 --- a/modules/kogito-trusty-redis/module.yaml +++ /dev/null @@ -1,31 +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. -# -schema_version: 1 -name: org.kie.kogito.trusty.redis -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/trusty-service-redis/trusty-service-redis-quarkus-app.zip - name: trusty-service-redis-quarkus-app.zip - -execute: - - script: configure - diff --git a/modules/kogito-trusty-ui/added/kogito-app-launch.sh b/modules/kogito-trusty-ui/added/kogito-app-launch.sh deleted file mode 100644 index be69ceb89..000000000 --- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -if [ "${SCRIPT_DEBUG}" = "true" ] ; then - set -x - SHOW_JVM_SETTINGS="-XshowSettings:properties" - log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed" - log_info "JVM settings debug is enabled." - printenv -fi - - -# Configuration scripts -# Any configuration script that needs to run on image startup must be added here. -CONFIGURE_SCRIPTS=( - "${KOGITO_HOME}"/launch/kogito-trusty-ui.sh - "${KOGITO_HOME}"/launch/configure-custom-truststore.sh -) -source "${KOGITO_HOME}"/launch/configure.sh -############################################# - -DYNAMIC_RESOURCES_OPTS="$(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/java-default-options) $(${JBOSS_CONTAINER_JAVA_JVM_MODULE}/debug-options)" - -# shellcheck disable=SC2086 -exec java ${SHOW_JVM_SETTINGS} ${DYNAMIC_RESOURCES_OPTS} ${JAVA_OPTIONS} ${KOGITO_TRUSTY_UI_PROPS} ${CUSTOM_TRUSTSTORE_ARGS} \ - -Dquarkus.http.host=0.0.0.0 \ - -Dquarkus.http.port=8080 \ - -jar "${KOGITO_HOME}"/bin/quarkus-app/quarkus-run.jar \ No newline at end of file diff --git a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh b/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh deleted file mode 100644 index 79fb63578..000000000 --- a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - - -#import -source "${KOGITO_HOME}"/launch/logging.sh - -function prepareEnv() { - # keep it on alphabetical order - unset KOGITO_TRUSTY_ENDPOINT -} - -function configure() { - configure_trusty_url -} - -# Exit codes: -# 10 - invalid url -function configure_trusty_url { - url_simple_regex='(https?)://' - local trustyURL=${KOGITO_TRUSTY_ENDPOINT} - if [ "${trustyURL}x" != "x" ]; then - if [[ ! "${trustyURL}x" =~ $url_simple_regex ]]; then - log_error "URL must start with http or https." - exit 10 - fi - else - log_info "Trusty url not set, default will be used: http://localhost:8180" - trustyURL="http://localhost:8180" - fi - KOGITO_TRUSTY_UI_PROPS="${KOGITO_TRUSTY_PROPS} -Dkogito.trusty.http.url=${trustyURL}" -} \ No newline at end of file diff --git a/modules/kogito-trusty-ui/configure b/modules/kogito-trusty-ui/configure deleted file mode 100644 index 13fc920e0..000000000 --- a/modules/kogito-trusty-ui/configure +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") -ADDED_DIR="${SCRIPT_DIR}"/added - -unzip "${SOURCES_DIR}"/trusty-ui-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ -cp -rv "${ADDED_DIR}"/launch/* "${KOGITO_HOME}"/launch/ - -chown -R 1001:0 "${KOGITO_HOME}" -chmod -R ug+rwX "${KOGITO_HOME}" - -cp -v "${ADDED_DIR}"/kogito-app-launch.sh "${KOGITO_HOME}" -chmod +x-w "${KOGITO_HOME}"/kogito-app-launch.sh - diff --git a/modules/kogito-trusty-ui/module.yaml b/modules/kogito-trusty-ui/module.yaml deleted file mode 100644 index 7559cc64c..000000000 --- a/modules/kogito-trusty-ui/module.yaml +++ /dev/null @@ -1,31 +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. -# -schema_version: 1 -name: org.kie.kogito.trusty.ui -version: "999-SNAPSHOT" - -# see build-kogito-apps-components.sh script, responsible for build it. -# called by the Makefile before builds -artifacts: - - path: /tmp/build/trusty-ui/trusty-ui-quarkus-app.zip - name: trusty-ui-quarkus-app.zip - -execute: - - script: configure - diff --git a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats b/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats deleted file mode 100644 index 6f755ab70..000000000 --- a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bats -# -# 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. -# - - -export KOGITO_HOME=/tmp/kogito -export HOME="${KOGITO_HOME}" -mkdir -p "${KOGITO_HOME}"/launch -cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/ - -# imports -load $BATS_TEST_DIRNAME/../../added/launch/kogito-trusty-ui.sh - -teardown() { - rm -rf "${KOGITO_HOME}" -} - -@test "test if the default value for trusty url will be set" { - local expected=" -Dkogito.trusty.http.url=http://localhost:8180" - configure_trusty_url - echo "Result is [${KOGITO_TRUSTY_UI_PROPS}] and expected is [${expected}]" >&2 - [ "${expected}" = "${KOGITO_TRUSTY_UI_PROPS}" ] -} - -@test "test if KOGITO_TRUSTY_URL will be correctly set " { - export KOGITO_TRUSTY_ENDPOINT="http://10.10.10.10:8080" - local expected=" -Dkogito.trusty.http.url=http://10.10.10.10:8080" - configure_trusty_url - echo "Result is [${KOGITO_TRUSTY_UI_PROPS}] and expected is [${expected}]" >&2 - [ "${expected}" = "${KOGITO_TRUSTY_UI_PROPS}" ] -} - -@test "test if a invalid value for trusty url will return the expected exit code" { - export KOGITO_TRUSTY_ENDPOINT="a.b.c" - run configure_trusty_url - [ "${status}" == "10" ] -} - - diff --git a/modules/rhpam-kogito-prod-profile/configure b/modules/rhpam-kogito-prod-profile/configure deleted file mode 100644 index f352652d1..000000000 --- a/modules/rhpam-kogito-prod-profile/configure +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -# -# 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. -# -set -e - -# configure Red Hat repositories on the maven settings.xml for product builds -if [ "${ENABLE_RH_MAVEN_REPO}" = "true" ]; then - echo "enabling red hat repositories" - rh_repos=" \ -\ - redhat-maven-repositories\ - \ - \ - redhat-ga-repository\ - https://maven.repository.redhat.com/ga/\ - \ - true\ - \ - \ - false\ - \ - \ - \ - redhat-ea-repository\ - https://maven.repository.redhat.com/earlyaccess/all/\ - \ - true\ - \ - \ - false\ - \ - \ - \ - redhat-techpreview-repository\ - https://maven.repository.redhat.com/techpreview/all\ - \ - true\ - \ - \ - false\ - \ - \ - \ - \ - \ - redhat-ga-plugin-repository\ - https://maven.repository.redhat.com/ga/\ - \ - true\ - \ - \ - false\ - \ - \ - \ - redhat-ea-plugin-repository\ - https://maven.repository.redhat.com/earlyaccess/all/\ - \ - true\ - \ - \ - false\ - \ - \ - \ - redhat-techpreview-repository\ - https://maven.repository.redhat.com/techpreview/all\ - \ - true\ - \ - \ - false\ - \ - \ - \ -\ -" - sed -i "s||$rh_repos|" "${MAVEN_SETTINGS_PATH}" - sed -i "s||redhat-maven-repositories|" "${MAVEN_SETTINGS_PATH}" - - mv "${MAVEN_SETTINGS_PATH}" "${KOGITO_HOME}"/.m2/settings.xml.bkp - #format and write the new file - xmllint --format "${KOGITO_HOME}"/.m2/settings.xml.bkp > "${MAVEN_SETTINGS_PATH}" -fi diff --git a/modules/rhpam-kogito-prod-profile/module.yaml b/modules/rhpam-kogito-prod-profile/module.yaml deleted file mode 100644 index 47af707f2..000000000 --- a/modules/rhpam-kogito-prod-profile/module.yaml +++ /dev/null @@ -1,30 +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. -# -schema_version: 1 -name: org.kie.kogito.rhpam.prod.profile -version: '7.13.0' -description: Holds custom configurations for productized Kogito images. Add as the last module as it can depend on other modules. - -envs: - - name: "ENABLE_RH_MAVEN_REPO" - value: "true" - description: "If set, will enable the usage of the Red Hat Maven repositories to resolve Java dependencies. Enabled by default on productized images." - -execute: -- script: configure \ No newline at end of file diff --git a/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml b/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml deleted file mode 100644 index 4930b68cd..000000000 --- a/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml +++ /dev/null @@ -1,25 +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. -# ---- !Policy -id: "cvp-logic-data-index-ephemeral-rhel8" -product_versions: - - cvp -decision_context: cvp_default -rules: - - !PassingTestCaseRule {test_case_name: logic-data-index-ephemeral-rhel8.openshift.external} \ No newline at end of file diff --git a/osbs-extra/logic-swf-builder-rhel8/gating.yaml b/osbs-extra/logic-swf-builder-rhel8/gating.yaml deleted file mode 100644 index d6ae18ae8..000000000 --- a/osbs-extra/logic-swf-builder-rhel8/gating.yaml +++ /dev/null @@ -1,25 +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. -# ---- !Policy -id: "cvp-logic-swf-builder-rhel8" -product_versions: - - cvp -decision_context: cvp_default -rules: - - !PassingTestCaseRule {test_case_name: logic-swf-builder-rhel8.openshift.external} \ No newline at end of file diff --git a/osbs-extra/logic-swf-devmode-rhel8/gating.yaml b/osbs-extra/logic-swf-devmode-rhel8/gating.yaml deleted file mode 100644 index d35f9bcf1..000000000 --- a/osbs-extra/logic-swf-devmode-rhel8/gating.yaml +++ /dev/null @@ -1,25 +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. -# ---- !Policy -id: "cvp-logic-swf-devmode-rhel8" -product_versions: - - cvp -decision_context: cvp_default -rules: - - !PassingTestCaseRule {test_case_name: logic-swf-devmode-rhel8.openshift.external} \ No newline at end of file diff --git a/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml deleted file mode 100644 index bb8ef66d4..000000000 --- a/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml +++ /dev/null @@ -1,25 +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. -# ---- !Policy -id: "cvp-rhpam-kogito-builder" -product_versions: - - cvp -decision_context: cvp_default -rules: - - !PassingTestCaseRule {test_case_name: rhpam-kogito-builder.openshift.external} \ No newline at end of file diff --git a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml deleted file mode 100644 index b0b6e9f01..000000000 --- a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml +++ /dev/null @@ -1,25 +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. -# ---- !Policy -id: "cvp-rhpam-kogito-runtime-jvm" -product_versions: - - cvp -decision_context: cvp_default -rules: - - !PassingTestCaseRule {test_case_name: rhpam-kogito-runtime-jvm.openshift.external} \ No newline at end of file diff --git a/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml b/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml deleted file mode 100644 index b0601469c..000000000 --- a/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml +++ /dev/null @@ -1,25 +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. -# ---- !Policy -id: "cvp-rhpam-kogito-runtime-native" -product_versions: - - cvp -decision_context: cvp_default -rules: - - !PassingTestCaseRule {test_case_name: rhpam-kogito-runtime-native.openshift.external} \ No newline at end of file diff --git a/scripts/README.md b/scripts/README.md index f0056efc3..28ed41d09 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -4,7 +4,6 @@ On this directory you can find some python scripts used to help with some repeti Today we have these scripts: -- [build-product-image.sh](build-product-image.sh) - [common.py](common.py) - [list-images.py](list-images.py) - [manage-kogito-version.py](manage-kogito-version.py) @@ -14,31 +13,6 @@ Today we have these scripts: - [update-repository.py](update-repository.py) - -### Build Product Image Script - -Script should not be used to build community images. Handled by `make build-prod` command. - -To switch the `build_engine` do the following: - -```bash -make BUILD_ENGINE=osbs build-prod -``` - - -It receives the Product image name to build the images. - -Example: - -```bash -cekit --verbose --redhat --descriptor logic-data-index-ephemeral-rhel8-image.yaml build docker -``` - -The product image name must respect the community image name: - - - rhpam-$(kogito_image_name)-rhel8 - - ### Common script The `common.py` script defines some common functions for the scripts. @@ -53,13 +27,6 @@ the community image list: $ python list-images.py ``` -And the product image list by using the `--prod` flag: - -```bash -$ python list-images.py --prod -``` - - ### Managing Kogito images version script The manage-kogito-version script will help when we need to update the current version due a new release. diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh index c36e5425e..24f7187da 100755 --- a/scripts/build-kogito-apps-components.sh +++ b/scripts/build-kogito-apps-components.sh @@ -60,27 +60,12 @@ case ${imageName} in "kogito-data-index-ephemeral") contextDir="data-index/data-index-service/data-index-service-inmemory" ;; - "kogito-data-index-infinispan") - contextDir="data-index/data-index-service/data-index-service-infinispan" - ;; - "kogito-data-index-mongodb") - contextDir="data-index/data-index-service/data-index-service-mongodb" - ;; - "kogito-data-index-oracle") - contextDir="data-index/data-index-service/data-index-service-oracle" - ;; "kogito-data-index-postgresql") contextDir="data-index/data-index-service/data-index-service-postgresql" ;; "kogito-jobs-service-ephemeral") contextDir="jobs-service/jobs-service-inmemory" ;; - "kogito-jobs-service-infinispan") - contextDir="jobs-service/jobs-service-infinispan" - ;; - "kogito-jobs-service-mongodb") - contextDir="jobs-service/jobs-service-mongodb" - ;; "kogito-jobs-service-postgresql") contextDir="jobs-service/jobs-service-postgresql" ;; @@ -91,21 +76,6 @@ case ${imageName} in contextDir="${contextDir} jobs-service/jobs-service-postgresql" contextDir="${contextDir} jobs-service/jobs-service-mongodb" ;; - "kogito-trusty-infinispan") - contextDir="trusty/trusty-service/trusty-service-infinispan" - ;; - "kogito-trusty-postgresql") - contextDir="trusty/trusty-service/trusty-service-postgresql" - ;; - "kogito-trusty-redis") - contextDir="trusty/trusty-service/trusty-service-redis" - ;; - "kogito-trusty-ui") - contextDir="trusty-ui" - ;; - "kogito-explainability") - contextDir="explainability/explainability-service-messaging explainability/explainability-service-rest" - ;; "kogito-jit-runner") contextDir="jitexecutor/jitexecutor-runner" ;; diff --git a/scripts/build-osbs.sh b/scripts/build-osbs.sh deleted file mode 100755 index f8a79ca47..000000000 --- a/scripts/build-osbs.sh +++ /dev/null @@ -1,228 +0,0 @@ -#!/bin/bash -# -# 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. -# - -set -e - -DEBUG= -GIT_USER=${GIT_USER:-"Your Name"} -GIT_EMAIL=${GIT_EMAIL:-"yourname@email.com"} -WORK_DIR=$(pwd)/build-temp - -function help() -{ - echo "usage: build-osbs.sh [options]" - echo - echo "Run a cekit osbs build of an rhpam ba operator image with bundle" - echo - echo "For each of the options below, the names of the arguments are environment variables that may be set" - echo "instead of using the particular option on the invocation" - echo "" - echo "Required:" - echo " -v PROD_VERSION Version being built. Passed to the build-overrides.sh -v option" - echo " -t OSBS_BUILD_TARGET Build target for osbs, for example rhba-7.3-openshift-containers-candidate" - echo "" - echo "Optional:" - echo " -h Print this help message" - echo " -p KERBEROS_PRINCIPAL Kerberos principal to use with to access build systems. If not specified," - echo " the script assumes there is a valid kerberos ticket in force. If it is specified" - echo " then one of KERBEROS_KEYTAB or KERBEROS_PASSWORD is required." - echo " -k KERBEROS_KEYTAB Path to a keytab file for KERBEROS_PRINCIPAL if no KERBEROS_PASSWORD is specified." - echo " -s KERBEROS_PASSWORD Password for KERBEROS_PRINCIPAL (a keytab file may be used instead via KERBEROS_KEYTAB)" - echo " -i OSBS_BUILD_USER Maps to the build-osbs-user option for cekit (ie the user for rhpkg commands)" - echo " The default will be KERBEROS_PRINCIPAL if this is not set" - echo " -b BUILD_DATE The date of the nightly build to access. Passed to the build-overrides.sh -b option if set" - echo " -w WORK_DIR The working directory used for generating overrides, cekit cache, etc. Default is ./build-temp." - echo " -u GIT_USER User config for git commits to internal repositories. Default is 'Your Name'" - echo " -e GIT_EMAIL Email config for git commits to internal repositories. Default is 'yourname@email.com'" - echo " -o CEKIT_BUILD_OPTIONS Additional options to pass through to the cekit build command, should be quoted" - echo " -l CEKIT_CACHE_LOCAL Comma-separated list of urls to download and add to the local cekit cache" - echo " -c PROD_COMPONENT Prod Component or image name that will be built." - echo " -g Debug setting, currently sets verbose flag on cekit commands" -} - - -function get_short_version() { - local version_array - local short_version=$1 - IFS='.' read -r -a version_array <<< "$1" - if [ ${#version_array[@]} -gt 1 ]; then - short_version="${version_array[0]}.${version_array[1]}" - fi - echo $short_version -} - -function check_for_required_envs() -{ - if [ -z "$GIT_EMAIL" ]; then - echo "No git email specified with GIT_EMAIL" - exit -1 - fi - if [ -z "$GIT_USER" ]; then - echo "No git user specified with GIT_USER" - exit -1 - fi - if [ -z "$PROD_VERSION" ]; then - echo "No version specified with PROD_VERSION" - exit -1 - fi - if [ -z "$OSBS_BUILD_TARGET" ]; then - echo "No build target specified with OSBS_BUILD_TARGET" - exit -1 - fi - if [ -z "PROD_COMPONENT" ]; then - echo "No prod component specified with PROD_COMPONENT" - exit -1 - fi -} - -function get_kerb_ticket() { - set +e - retries=10 - delay=5 - if [ -n "$KERBEROS_PASSWORD" ]; then - echo "$KERBEROS_PASSWORD" | kinit "$KERBEROS_PRINCIPAL" - _klist - if [ "$?" -ne 0 ]; then - echo "Failed to get kerberos token for $KERBEROS_PRINCIPAL with password" - exit -1 - fi - elif [ -n "$KERBEROS_KEYTAB" ]; then - for i in `seq 1 $retries`; do - kinit -k -t "$KERBEROS_KEYTAB" "$KERBEROS_PRINCIPAL" - [ $? -eq 0 ] && break - echo "Failed to acquire Kerberos ticket, retrying (try $i of $retries)..." - _klist - sleep $delay - done - if [ "$?" -ne 0 ]; then - echo "Failed to get kerberos token for $KERBEROS_PRINCIPAL with $KERBEROS_KEYTAB" - exit -1 - fi - else - echo "No kerberos password or keytab specified with KERBEROS_PASSWORD or KERBEROS_KEYTAB" - exit -1 - fi - set -e -} - -# _klist will help to indentify if the kerberos ticket, prints when debug is enabled -function _klist() { - if [ -n "$DEBUG" ]; then - klist - fi -} - - -function set_git_config() { - git config --global user.email "$GIT_EMAIL" - git config --global user.name "$GIT_USER" - git config --global core.pager "" -} - - -while getopts gu:e:v:c:t:o:r:n:d:p:k:s:b:l:i:w:h option; do - case $option in - g) - DEBUG=true - ;; - u) - GIT_USER=$OPTARG - ;; - e) - GIT_EMAIL=$OPTARG - ;; - v) - PROD_VERSION=$OPTARG - ;; - c) - PROD_COMPONENT=$OPTARG - ;; - t) - OSBS_BUILD_TARGET=$OPTARG - ;; - o) - CEKIT_BUILD_OPTIONS=$OPTARG - ;; - p) - KERBEROS_PRINCIPAL=$OPTARG - ;; - k) - KERBEROS_KEYTAB=$OPTARG - ;; - s) - KERBEROS_PASSWORD=$OPTARG - ;; - b) - BUILD_DATE=$OPTARG - ;; - l) - CEKIT_CACHE_LOCAL=$OPTARG - ;; - i) - OSBS_BUILD_USER=$OPTARG - ;; - w) - WORK_DIR=$OPTARG - ;; - h) - help - exit 0 - ;; - *) - ;; - esac -done -shift $((OPTIND-1)) - -mkdir -p $WORK_DIR -bo_options=" --no-color" - -check_for_required_envs -set_git_config - -if [ -n "$KERBEROS_PRINCIPAL" ]; then - get_kerb_ticket - # overrides the OSBS_BUILD_USER if it is not set and KERBEROS principal is in use - if [ ! -n "$OSBS_BUILD_USER" ]; then - echo "setting OSBS_BUILD_USER to KERBEROS_PRINCIPAL" - # need to catch only the first part of the principal, before the / otherwise 'rhpkg' will fail - OSBS_BUILD_USER=$(echo ${KERBEROS_PRINCIPAL} | awk -F"/" '{print $1}') - fi -else - echo No kerberos principal specified, assuming there is a current kerberos ticket -fi - -debug= -if [ -n "$DEBUG" ]; then - debug="--verbose" -fi - -builduser= -if [ -n "$OSBS_BUILD_USER" ]; then - builduser="$OSBS_BUILD_USER" -fi - -cd ../ -set -x -PROD_C="${PROD_COMPONENT}-image" -# hack to replace the branch overrides as cekit detects two osbs sections and don't know which one to override. -sed -i 's/rhba-7-rhel-8/rhba-7-rhel-8-nightly/g' ${PROD_C}.yaml -make container-build-osbs prod_component=${PROD_C} -set +x diff --git a/scripts/build-product-image.sh b/scripts/build-product-image.sh deleted file mode 100755 index 3abd3b052..000000000 --- a/scripts/build-product-image.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env bash -# -# 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. -# - -# Simple usage: /bin/sh scripts/build-product-image.sh "build" ${IMAGE_NAME} ${BUILD_ENGINE} - -ver=$(cekit --version ) -ver=$((${ver//./} + 0)) -if [ ${ver//./} -lt 379 ]; then - echo "Using CEKit version $ver, Please use CEKit version 3.8.0 or greater." - exit 10 -fi - -image="${2}" -if [ "x${image}" == "x" ]; then - echo "image_name can't be empty.." - exit 8 -fi - -BUILD_ENGINE="${3:-docker}" -CEKIT_CMD="cekit --verbose --redhat" - -ACTION=${1} -case ${ACTION} in - "build") - echo "Using ${BUILD_ENGINE} build engine" - ${CEKIT_CMD} --descriptor ${image_name}-image.yaml build ${BUILD_ENGINE} - ;; - - "test") - ${CEKIT_CMD} --descriptor ${image_name}-image.yaml test behave $3 - ;; - *) - echo "Please use build or test actions." - ;; -esac - diff --git a/scripts/common.py b/scripts/common.py index bc99fa70c..9398669b7 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -30,12 +30,10 @@ MODULES_DIR = "modules" COMMUNITY_PREFIX = 'kogito-' -PRODUCT_PREFIX = 'logic-' # imagestream file that contains all images, this file aldo needs to be updated. PROJECT_VERSIONS_MODULE = "modules/kogito-project-versions/module.yaml" IMAGE_STREAM_FILENAME = "kogito-imagestream.yaml" -PROD_IMAGE_STREAM_FILENAME = "logic-imagestream.yaml" KOGITO_VERSION_ENV_KEY = "KOGITO_VERSION" KOGITO_VERSION_LABEL_NAME = "org.kie.kogito.version" @@ -48,19 +46,14 @@ CLONE_REPO_SCRIPT = 'tests/test-apps/clone-repo.sh' SETUP_MAVEN_SCRIPT = 'scripts/setup-maven.sh' -SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral", "kogito-data-index-infinispan", - "kogito-data-index-mongodb", "kogito-data-index-oracle", - "kogito-data-index-postgresql", "kogito-explainability", +SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral", + "kogito-data-index-postgresql", "kogito-jit-runner", "kogito-jobs-service-ephemeral", - "kogito-jobs-service-infinispan", "kogito-jobs-service-mongodb", "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone", - "kogito-management-console", "kogito-task-console", - "kogito-trusty-infinispan", "kogito-trusty-postgresql", - "kogito-trusty-redis", "kogito-trusty-ui"} + "kogito-management-console", "kogito-task-console" + } -PROD_SUPPORTING_SERVICES_IMAGES = {"logic-data-index-ephemeral-rhel8"} SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-base-builder", "kogito-swf-devmode"} -PROD_SWF_BUILDER_IMAGES = {"logic-swf-devmode-rhel8", "logic-swf-builder-rhel8"} def yaml_loader(): @@ -84,15 +77,6 @@ def update_community_images_version(target_version): update_image_version_tag_in_yaml_file(target_version, "{}-image.yaml".format(img)) -def update_prod_image_version(target_version): - """ - Update logic-*-image.yaml files version tag. - :param target_version: version used to update the files - """ - for img in sorted(get_prod_images()): - update_image_version_tag_in_yaml_file(target_version, "{}-image.yaml".format(img)) - - def update_image_version_tag_in_yaml_file(target_version, yaml_file): """ Update root version tag in yaml file. @@ -110,15 +94,12 @@ def update_image_version_tag_in_yaml_file(target_version, yaml_file): except TypeError as err: print("Unexpected error:", err) -def update_image_stream(target_version, prod=False): +def update_image_stream(target_version): """ Update the imagestream file, it will update the tag name, version and image tag. - :param prod: if the imagestream is the prod version :param target_version: version used to update the imagestream file; """ image_stream_filename = IMAGE_STREAM_FILENAME - if prod: - image_stream_filename = PROD_IMAGE_STREAM_FILENAME print("Updating ImageStream images version from file {0} to version {1}".format(image_stream_filename, target_version)) try: @@ -160,25 +141,12 @@ def get_community_module_dirs(): """ community_modules = [] for module_path in get_all_module_dirs(): - if "{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(COMMUNITY_PREFIX) and os.path.basename(module_path) != "prod": + if "{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(COMMUNITY_PREFIX): community_modules.append(module_path) return community_modules - -def get_prod_module_dirs(): - """ - Retrieve the Logic module directories - """ - prod_modules = [] - for module_path in get_all_module_dirs(): - if "{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(PRODUCT_PREFIX) or ("{0}".format(os.path.relpath(module_path, MODULES_DIR)).startswith(COMMUNITY_PREFIX) and os.path.basename(module_path) == "prod"): - prod_modules.append(module_path) - - return prod_modules - - def get_images(prefix): """ Retrieve the Kogito images' files @@ -202,41 +170,26 @@ def get_community_images(): return get_images(COMMUNITY_PREFIX) -def get_prod_images(): - """ - Retrieve the Prod images' names - """ - return get_images(PRODUCT_PREFIX) - - -def get_supporting_services_images(is_prod_image): +def get_supporting_services_images(): """ Retrieve the Supporting Services images' names """ - if is_prod_image: - return PROD_SUPPORTING_SERVICES_IMAGES return SUPPORTING_SERVICES_IMAGES -def is_supporting_services_or_swf_builder(image_name, prod=False): +def is_supporting_services_or_swf_builder(image_name): """ Raise an error if the given image is not a supporting service """ found = False - if prod: - if image_name not in PROD_SUPPORTING_SERVICES_IMAGES: - raise RuntimeError('{} is not a productized supporting service'.format(image_name)) - else: - if image_name not in SUPPORTING_SERVICES_IMAGES and image_name not in SWF_BUILDER_IMAGES: - raise RuntimeError('{} is not a supporting service or a swf builder image.'.format(image_name)) + if image_name not in SUPPORTING_SERVICES_IMAGES and image_name not in SWF_BUILDER_IMAGES: + raise RuntimeError('{} is not a supporting service or a swf builder image.'.format(image_name)) -def get_swf_builder_images(is_prod_image): +def get_swf_builder_images(): """ Raise an error if the given image is not a supporting service """ - if is_prod_image: - return PROD_SWF_BUILDER_IMAGES return SWF_BUILDER_IMAGES @@ -261,18 +214,14 @@ def get_project_versions_module_data(): raise -def update_kogito_modules_version(target_version, prod=False): +def update_kogito_modules_version(target_version): """ Update every Kogito module.yaml to the given version. - :param prod: if the module to be updated is prod version. :param target_version: version used to update all Kogito module.yaml files """ modules = [] current_version = retrieve_version() - if prod: - modules = get_prod_module_dirs() - else: - modules = get_community_module_dirs() + modules = get_community_module_dirs() for module_dir in modules: update_kogito_module_version(module_dir, current_version, target_version) @@ -299,13 +248,13 @@ def update_kogito_module_version(module_dir, old_version, target_version): except TypeError: raise -def update_quarkus_platform_version_in_build(quarkus_platform_version, prod=False): +def update_quarkus_platform_version_in_build(quarkus_platform_version): """ Update quarkus_platform_version version into images/modules :param quarkus_platform_version: quarkus version to set """ - update_env_value(QUARKUS_PLATFORM_VERSION_ENV_KEY, quarkus_platform_version, prod) - update_label_value(QUARKUS_PLATFORM_VERSION_LABEL_NAME, quarkus_platform_version, prod) + update_env_value(QUARKUS_PLATFORM_VERSION_ENV_KEY, quarkus_platform_version) + update_label_value(QUARKUS_PLATFORM_VERSION_LABEL_NAME, quarkus_platform_version) def update_quarkus_platform_version_in_behave_tests_repository_paths(quarkus_platform_version): """ @@ -342,13 +291,13 @@ def update_examples_uri_in_behave_tests(examples_uri): replacement = examples_uri update_in_behave_tests(pattern, replacement) -def update_artifacts_version_in_build(artifacts_version, prod=False): +def update_artifacts_version_in_build(artifacts_version): """ Update artifacts version into modules / images :param artifacts_version: artifacts version to set """ - update_env_value(KOGITO_VERSION_ENV_KEY, artifacts_version, prod) - update_label_value(KOGITO_VERSION_LABEL_NAME, artifacts_version, prod) + update_env_value(KOGITO_VERSION_ENV_KEY, artifacts_version) + update_label_value(KOGITO_VERSION_LABEL_NAME, artifacts_version) def update_artifacts_version_in_behave_tests(artifacts_version): """ @@ -415,17 +364,16 @@ def update_maven_mirror_url_in_quarkus_plugin_behave_tests(mirror_url): "MAVEN_MIRROR_URL", mirror_url) update_in_behave_tests(pattern, replacement) -def update_maven_repo_env_value(repo_url, replace_default_repository, prod=False): +def update_maven_repo_env_value(repo_url, replace_default_repository): """ Update the given maven repository value for all images/modules. :param repo_url: Maven repository url :param replace_default_repository: Set to true if default repository needs to be overidden - :param prod: if the module to be updated is prod version. """ env_name = "MAVEN_REPO_URL" if replace_default_repository: env_name = "DEFAULT_MAVEN_REPO_URL" - update_env_value(env_name, repo_url, prod) + update_env_value(env_name, repo_url) def ignore_maven_self_signed_certificate_in_behave_tests(): @@ -500,7 +448,7 @@ def update_maven_repo_in_setup_maven(repo_url, replace_default_repository): replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url) update_in_file(SETUP_MAVEN_SCRIPT, pattern, replacement) -def update_env_value(env_name, env_value, prod=False): +def update_env_value(env_name, env_value): """ Update environment value into the given yaml module/image file :param env_name: environment variable name to update @@ -509,12 +457,8 @@ def update_env_value(env_name, env_value, prod=False): images = [] modules = [] - if prod: - images = get_prod_images() - modules = get_prod_module_dirs() - else: - images = get_community_images() - modules = get_community_module_dirs() + images = get_community_images() + modules = get_community_module_dirs() for image_name in images: image_filename = "{}-image.yaml".format(image_name) @@ -591,7 +535,7 @@ def update_env_value_in_build_config_modules(env_name, new_value, ignore_empty = except TypeError: raise -def update_label_value(label_name, label_value, prod=False): +def update_label_value(label_name, label_value): """ Update label value in all module / image files :param label_name: label name to update @@ -600,12 +544,8 @@ def update_label_value(label_name, label_value, prod=False): images = [] modules = [] - if prod: - images = get_prod_images() - modules = get_prod_module_dirs() - else: - images = get_community_images() - modules = get_community_module_dirs() + images = get_community_images() + modules = get_community_module_dirs() for image_name in images: image_filename = "{}-image.yaml".format(image_name) @@ -707,6 +647,3 @@ def update_field_in_dict(data, key, new_value, ignore_empty = False): print("Community modules:") for m in get_community_module_dirs(): print("module {}".format(m)) - print("\nProd modules:") - for m in get_prod_module_dirs(): - print("module {}".format(m)) diff --git a/scripts/list-images.py b/scripts/list-images.py index 6ad2c154b..9d77880cd 100644 --- a/scripts/list-images.py +++ b/scripts/list-images.py @@ -33,7 +33,6 @@ if __name__ == "__main__": parser = argparse.ArgumentParser( description='Kogito Version Manager - List Images by Community and Product version') - parser.add_argument('--prod', default=False, action='store_true', help='List product images') parser.add_argument('--swf-builder', default=False, action='store_true', help='List swf builder images') parser.add_argument('-s', '--supporting-services', default=False, action='store_true', help='List Supporting Services images') @@ -44,13 +43,11 @@ images = [] if args.is_supporting_services_or_swf_builder: - common.is_supporting_services_or_swf_builder(args.is_supporting_services_or_swf_builder, args.prod) + common.is_supporting_services_or_swf_builder(args.is_supporting_services_or_swf_builder) elif args.supporting_services: - images = common.get_supporting_services_images(args.prod) - elif args.prod: - images = common.get_prod_images() + images = common.get_supporting_services_images() elif args.swf_builder: - images = common.get_swf_builder_images(args.prod) + images = common.get_swf_builder_images() else: images = common.get_community_images() diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py index 1a407f4a7..04cb161fb 100644 --- a/scripts/manage-kogito-version.py +++ b/scripts/manage-kogito-version.py @@ -46,7 +46,6 @@ parser.add_argument('--examples-ref', dest='examples_ref', help='Update Behave tests to use the desired branch for kogito-examples') parser.add_argument('--confirm', default=False, action='store_true', help='To confirm automatically the setup') - parser.add_argument('--prod', default=False, action='store_true', help='Update product modules/images') args = parser.parse_args() @@ -68,31 +67,23 @@ if args.artifacts_version: artifacts_version = args.artifacts_version - if args.prod: - print("Product images version will be updated to {0}".format(args.bump_to)) - else: - print("Images version will be updated to {0}".format(args.bump_to)) - print("Artifacts version will be updated to {0}".format(artifacts_version)) - print("Examples ref will be updated to {}".format(examples_ref)) + print("Images version will be updated to {0}".format(args.bump_to)) + print("Artifacts version will be updated to {0}".format(artifacts_version)) + print("Examples ref will be updated to {}".format(examples_ref)) if not args.confirm: input("Is the information correct? If so press any key to continue...") # modules - if args.prod: - common.update_kogito_modules_version(args.bump_to, args.prod) - common.update_prod_image_version(args.bump_to) - common.update_image_stream(args.bump_to, args.prod) - else: - common.update_kogito_modules_version(args.bump_to) # Need to be done before updating the project data version - common.update_community_images_version(args.bump_to) - common.update_image_stream(args.bump_to) - common.update_artifacts_version_in_build(artifacts_version) + common.update_kogito_modules_version(args.bump_to) # Need to be done before updating the project data version + common.update_community_images_version(args.bump_to) + common.update_image_stream(args.bump_to) + common.update_artifacts_version_in_build(artifacts_version) - # tests default values - common.update_examples_ref_in_behave_tests(examples_ref) - common.update_examples_ref_in_clone_repo(examples_ref) - common.update_artifacts_version_in_behave_tests(artifacts_version) + # tests default values + common.update_examples_ref_in_behave_tests(examples_ref) + common.update_examples_ref_in_clone_repo(examples_ref) + common.update_artifacts_version_in_behave_tests(artifacts_version) else: print("Provided version {0} does not match the expected regex - {1}".format(args.bump_to, pattern)) else: diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh index 79c11c5a3..c7e1adecc 100755 --- a/scripts/run-bats.sh +++ b/scripts/run-bats.sh @@ -29,12 +29,6 @@ else rm -rf bats-core fi -echo "----> running bats on kogito-trusty-common" -./bats/bin/bats modules/kogito-trusty-common/tests/bats - -echo "----> running bats on kogito-explainability" -./bats/bin/bats modules/kogito-explainability/tests/bats - echo "----> running bats on kogito-graalvm-scripts" ./bats/bin/bats modules/kogito-graalvm-scripts/common/tests/bats @@ -50,9 +44,6 @@ echo "----> running bats on kogito-management-console" echo "----> running bats on kogito-task-console" ./bats/bin/bats modules/kogito-task-console/tests/bats/ -echo "----> running bats on kogito-trusty-ui" -./bats/bin/bats modules/kogito-trusty-ui/tests/bats/ - echo "----> running bats on kogito-maven" ./bats/bin/bats modules/kogito-maven/tests/bats diff --git a/scripts/update-repository.py b/scripts/update-repository.py index 9465535c5..2583e4096 100644 --- a/scripts/update-repository.py +++ b/scripts/update-repository.py @@ -56,7 +56,6 @@ help='To update the runtime native image name in behave tests\'s steps') parser.add_argument('--tests-only', dest='tests_only', default=False, action='store_true', help='Update product modules/images') - parser.add_argument('--prod', default=False, action='store_true', help='Update product modules/images') args = parser.parse_args() if args.repo_url: @@ -64,7 +63,7 @@ common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_default_repo) common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_default_repo) if not args.tests_only: - common.update_maven_repo_env_value(args.repo_url, args.replace_default_repo, args.prod) + common.update_maven_repo_env_value(args.repo_url, args.replace_default_repo) if args.ignore_self_signed_cert: common.ignore_maven_self_signed_certificate_in_build_config() @@ -87,11 +86,11 @@ common.update_examples_ref_in_clone_repo(args.examples_ref) if args.artifacts_version: - common.update_artifacts_version_in_build(args.artifacts_version, args.prod) + common.update_artifacts_version_in_build(args.artifacts_version) if args.quarkus_platform_version: if not args.tests_only: - common.update_quarkus_platform_version_in_build(args.quarkus_platform_version, args.prod) + common.update_quarkus_platform_version_in_build(args.quarkus_platform_version) common.update_quarkus_platform_version_in_behave_tests_repository_paths(args.quarkus_platform_version) diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature index 654c3af10..b543feba3 100644 --- a/tests/features/common-build-runtime.feature +++ b/tests/features/common-build-runtime.feature @@ -1,8 +1,6 @@ @quay.io/kiegroup/kogito-s2i-builder @quay.io/kiegroup/kogito-runtime-native @quay.io/kiegroup/kogito-runtime-jvm -@rhpam-7/rhpam-kogito-builder-rhel8 -@rhpam-7/rhpam-kogito-runtime-jvm-rhel8 Feature: Common tests for Kogito builder and runtime images # This scenario launches a container that dies instantly, causing Cekit to hand trying to fetch logs diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature index 6e2bb6712..4184dc17c 100644 --- a/tests/features/common-custom-truststore.feature +++ b/tests/features/common-custom-truststore.feature @@ -1,21 +1,11 @@ @quay.io/kiegroup/kogito-runtime-jvm -@quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-ephemeral -@quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-data-index-postgresql @quay.io/kiegroup/kogito-task-console @quay.io/kiegroup/kogito-management-console -@quay.io/kiegroup/kogito-explainability @quay.io/kiegroup/kogito-jit-runner @quay.io/kiegroup/kogito-jobs-service-ephemeral -@quay.io/kiegroup/kogito-jobs-service-infinispan -@quay.io/kiegroup/kogito-jobs-service-mongodb @quay.io/kiegroup/kogito-jobs-service-postgresql -@quay.io/kiegroup/kogito-trusty-infinispan -@quay.io/kiegroup/kogito-trusty-redis -@quay.io/kiegroup/kogito-trusty-postgresql -@rhpam-7/rhpam-kogito-runtime-jvm-rhel8 -@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8 Feature: Common tests for Custom TrustStore configuration # This test sets an invalid certificate to the container, it fails to start, and if timing is bad cekit hangs on 'Running command ps -C java in container' # See https://github.com/apache/incubator-kie-kogito-images/issues/1722 diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature index d65e79dbe..da33c0d08 100644 --- a/tests/features/common-dynamic-resources.feature +++ b/tests/features/common-dynamic-resources.feature @@ -2,25 +2,13 @@ # See https://github.com/apache/incubator-kie-kogito-images/issues/1722 #@quay.io/kiegroup/kogito-s2i-builder #@quay.io/kiegroup/kogito-runtime-jvm -#@quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-ephemeral -#@quay.io/kiegroup/kogito-data-index-mongodb #@quay.io/kiegroup/kogito-data-index-postgresql -#@quay.io/kiegroup/kogito-trusty-infinispan -#@quay.io/kiegroup/kogito-trusty-redis -#@quay.io/kiegroup/kogito-trusty-postgresql -#@quay.io/kiegroup/kogito-trusty-ui -#@quay.io/kiegroup/kogito-explainability #@quay.io/kiegroup/kogito-jit-runner @quay.io/kiegroup/kogito-jobs-service-ephemeral -#@quay.io/kiegroup/kogito-jobs-service-infinispan -#@quay.io/kiegroup/kogito-jobs-service-mongodb #@quay.io/kiegroup/kogito-jobs-service-postgresql #@quay.io/kiegroup/kogito-management-console #@quay.io/kiegroup/kogito-task-console -#@rhpam-7/rhpam-kogito-runtime-jvm-rhel8 -#@rhpam-7/rhpam-kogito-builder-rhel8 -#@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8 Feature: Common tests for Kogito images Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO diff --git a/tests/features/common.feature b/tests/features/common.feature index 6cac9b8e0..779232420 100644 --- a/tests/features/common.feature +++ b/tests/features/common.feature @@ -1,28 +1,15 @@ @quay.io/kiegroup/kogito-s2i-builder @quay.io/kiegroup/kogito-runtime-jvm @quay.io/kiegroup/kogito-runtime-native -@quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-ephemeral -@quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-data-index-postgresql -@quay.io/kiegroup/kogito-trusty-infinispan -@quay.io/kiegroup/kogito-trusty-redis -@quay.io/kiegroup/kogito-trusty-postgresql -@quay.io/kiegroup/kogito-trusty-ui -@quay.io/kiegroup/kogito-explainability @quay.io/kiegroup/kogito-jit-runner @quay.io/kiegroup/kogito-jobs-service-ephemeral -@quay.io/kiegroup/kogito-jobs-service-infinispan -@quay.io/kiegroup/kogito-jobs-service-mongodb @quay.io/kiegroup/kogito-jobs-service-postgresql @quay.io/kiegroup/kogito-management-console @quay.io/kiegroup/kogito-task-console @quay.io/kiegroup/kogito-swf-builder @quay.io/kiegroup/kogito-base-builder -@rhpam-7/rhpam-kogito-runtime-jvm-rhel8 -@rhpam-7/rhpam-kogito-builder-rhel8 -@rhpam-7/rhpam-kogito-runtime-native-rhel8 -@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8 Feature: Common tests for Kogito images Scenario: Verify if Kogito user is correctly configured diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature index 6ed0ec810..a4de284fb 100644 --- a/tests/features/data-index/kogito-data-index-common.feature +++ b/tests/features/data-index/kogito-data-index-common.feature @@ -1,8 +1,5 @@ -@quay.io/kiegroup/kogito-data-index-infinispan @quay.io/kiegroup/kogito-data-index-ephemeral -@quay.io/kiegroup/kogito-data-index-mongodb @quay.io/kiegroup/kogito-data-index-postgresql -@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8 Feature: Kogito-data-index common feature. Scenario: Verify if the debug is correctly enabled and test default http port diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature deleted file mode 100644 index 399530742..000000000 --- a/tests/features/data-index/kogito-data-index-infinispan.feature +++ /dev/null @@ -1,33 +0,0 @@ -@quay.io/kiegroup/kogito-data-index-infinispan -Feature: Kogito-data-index infinispan feature. - - Scenario: verify if all labels are correctly set on kogito-data-index-infinispan image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Infinispan persistence provider - And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Infinispan - And the image should contain label io.openshift.tags with value kogito,data-index,data-index-infinispan - - Scenario: verify if all parameters are correctly set - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | QUARKUS_INFINISPAN_CLIENT_HOSTS | 172.18.0.1:11222 | - | QUARKUS_INFINISPAN_CLIENT_USE_AUTH | true | - | QUARKUS_INFINISPAN_CLIENT_USERNAME | IamNotExist | - | QUARKUS_INFINISPAN_CLIENT_PASSWORD | hard2guess | - | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM | SecretRealm | - | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM | COOLGSSAPI | - Then container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222 - And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true - And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess - And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist - And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal - And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI - - Scenario: check if the default quarkus profile is correctly set on data index - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - Then container log should contain -Dquarkus.profile=kafka-events-support \ No newline at end of file diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature deleted file mode 100644 index 10578dc94..000000000 --- a/tests/features/data-index/kogito-data-index-mongodb.feature +++ /dev/null @@ -1,31 +0,0 @@ -@quay.io/kiegroup/kogito-data-index-mongodb -Feature: Kogito-data-index mongodb feature. - - Scenario: verify if all labels are correctly set on kogito-data-index-mongodb image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Mongodb persistence provider - And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Mongodb - And the image should contain label io.openshift.tags with value kogito,data-index,data-index-mongodb - - Scenario: verify if all parameters are correctly set - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://172.18.0.1:27071 | - | QUARKUS_MONGODB_DATABASE | database | - | QUARKUS_MONGODB_CREDENTIALS_AUTH_USERNAME | IamNotExist | - | QUARKUS_MONGODB_CREDENTIALS_AUTH_PASSWORD | SecretRealm | - | QUARKUS_MONGODB_CREDENTIALS_AUTH_MECHANISM | MONGODB-X509 | - Then container log should contain QUARKUS_MONGODB_CONNECTION_STRING=mongodb://172.18.0.1:27071 - And container log should contain QUARKUS_MONGODB_DATABASE=database - And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_USERNAME=IamNotExist - And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_PASSWORD=SecretRealm - And container log should contain QUARKUS_MONGODB_CREDENTIALS_AUTH_MECHANISM=MONGODB-X509 - - Scenario: check if the default quarkus profile is correctly set on data index - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - Then container log should contain -Dquarkus.profile=kafka-events-support \ No newline at end of file diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature deleted file mode 100644 index 64bb79819..000000000 --- a/tests/features/data-index/kogito-data-index-oracle.feature +++ /dev/null @@ -1,26 +0,0 @@ -@quay.io/kiegroup/kogito-data-index-oracle -Feature: Kogito-data-index oracle feature. - - Scenario: verify if all labels are correctly set on kogito-data-index-oracle image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Oracle persistence provider - And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Oracle - And the image should contain label io.openshift.tags with value kogito,data-index,data-index-oracle - - Scenario: verify if of container is correctly started with oracle parameters - When container is started with env - | variable | value | - | QUARKUS_DATASOURCE_JDBC_URL | jdbc:oracle:thin:@//10.1.1.53:1521/quarkus | - | QUARKUS_DATASOURCE_USERNAME | kogito | - | QUARKUS_DATASOURCE_PASSWORD | s3cr3t | - Then container log should contain java.sql.SQLRecoverableException: ORA-17002: I/O error - And container log should not contain Application failed to start - - Scenario: check if the default quarkus profile is correctly set on data index - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - Then container log should contain -Dquarkus.profile=kafka-events-support - And container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar \ No newline at end of file diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature index 432fcddcb..34e21b0a3 100644 --- a/tests/features/jobs-service/kogito-jobs-service-common.feature +++ b/tests/features/jobs-service/kogito-jobs-service-common.feature @@ -1,5 +1,3 @@ -@quay.io/kiegroup/kogito-jobs-service-infinispan -@quay.io/kiegroup/kogito-jobs-service-mongodb @quay.io/kiegroup/kogito-jobs-service-ephemeral @quay.io/kiegroup/kogito-jobs-service-postgresql @quay.io/kiegroup/kogito-jobs-service-allinone diff --git a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature deleted file mode 100644 index 3c235a53d..000000000 --- a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature +++ /dev/null @@ -1,33 +0,0 @@ -@quay.io/kiegroup/kogito-jobs-service-infinispan -Feature: Kogito-jobs-service-infinispan feature. - - Scenario: verify if all labels are correctly set kogito-jobs-service image image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Infinispan - And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Infinispan - And the image should contain label io.openshift.tags with value kogito,jobs-service-infinispan - - Scenario: Verify if the application jar exists - When container is started with command bash - Then run sh -c 'ls /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar - - Scenario: verify if auth is correctly set - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | QUARKUS_INFINISPAN_CLIENT_HOSTS | 172.18.0.1:11222 | - | QUARKUS_INFINISPAN_CLIENT_USE_AUTH | true | - | QUARKUS_INFINISPAN_CLIENT_USERNAME | IamNotExist | - | QUARKUS_INFINISPAN_CLIENT_PASSWORD | hard2guess | - | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM | SecretRealm | - | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM | COOLGSSAPI | - Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar - And container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222 - And container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true - And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess - And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist - And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal - And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI - And container log should not contain Application failed to start diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature deleted file mode 100644 index 3642f616c..000000000 --- a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature +++ /dev/null @@ -1,23 +0,0 @@ -@quay.io/kiegroup/kogito-jobs-service-mongodb -Feature: Kogito-jobs-service-mongodb feature. - - Scenario: verify if all labels are correctly set kogito-jobs-service image image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on MongoDB - And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on MongoDB - And the image should contain label io.openshift.tags with value kogito,jobs-service-mongodb - - Scenario: Verify if the application jar exists - When container is started with command bash - Then run sh -c 'ls /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar - - Scenario: verify if the container is correctly started with mongo parameters - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | QUARKUS_MONGODB_CONNECTION_STRING | mongodb://user:password@localhost:27017/admin | - | QUARKUS_MONGODB_DATABASE | kogito | - Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar - And container log should not contain Application failed to start diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature index 0fb180b03..ab4bf8711 100644 --- a/tests/features/kogito-common-builder-jvm.feature +++ b/tests/features/kogito-common-builder-jvm.feature @@ -1,4 +1,4 @@ -@quay.io/kiegroup/kogito-s2i-builder @rhpam-7/rhpam-kogito-builder-rhel8 +@quay.io/kiegroup/kogito-s2i-builder Feature: kogito-s2i-builder image JVM build tests Scenario: verify if the maven and java installation are correct diff --git a/tests/features/kogito-common-postresql-services.feature b/tests/features/kogito-common-postresql-services.feature index da0754237..cf77b26fd 100644 --- a/tests/features/kogito-common-postresql-services.feature +++ b/tests/features/kogito-common-postresql-services.feature @@ -1,4 +1,3 @@ -@quay.io/kiegroup/kogito-trusty-postgresql @quay.io/kiegroup/kogito-data-index-postgresql Feature: Kogito-data-index postgresql feature. diff --git a/tests/features/kogito-common-runtime-jvm.feature b/tests/features/kogito-common-runtime-jvm.feature index d3501b6b1..79b8c98b8 100644 --- a/tests/features/kogito-common-runtime-jvm.feature +++ b/tests/features/kogito-common-runtime-jvm.feature @@ -1,5 +1,4 @@ @quay.io/kiegroup/kogito-runtime-jvm -@rhpam-7/rhpam-kogito-runtime-jvm-rhel8 Feature: kogito-runtime-jvm feature. Scenario: verify if the java installation is correct diff --git a/tests/features/kogito-common-runtime-native.feature b/tests/features/kogito-common-runtime-native.feature index 5d435894f..9715614ca 100644 --- a/tests/features/kogito-common-runtime-native.feature +++ b/tests/features/kogito-common-runtime-native.feature @@ -1,5 +1,4 @@ @quay.io/kiegroup/kogito-runtime-native -@rhpam-7/rhpam-kogito-runtime-native-rhel8 Feature: Kogito-runtime-native feature. Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus native diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature deleted file mode 100644 index ba997ebd4..000000000 --- a/tests/features/kogito-explainability.feature +++ /dev/null @@ -1,38 +0,0 @@ -@quay.io/kiegroup/kogito-explainability -Feature: Kogito-explainability feature. - - Scenario: verify if all labels are correctly set on kogito-explainability image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Explainability Service - And the image should contain label io.k8s.display-name with value Kogito Explainability Service - And the image should contain label io.openshift.tags with value kogito,explainability - - Scenario: verify if the messaging binary is available on /home/kogito - When container is started with command bash - Then run sh -c 'ls /home/kogito/bin/messaging/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/messaging/quarkus-app/quarkus-run.jar - - Scenario: verify if the rest binary is available on /home/kogito - When container is started with command bash - Then run sh -c 'ls /home/kogito/bin/rest/quarkus-app/quarkus-run.jar' in container and immediately check its output for /home/kogito/bin/rest/quarkus-app/quarkus-run.jar - - Scenario: Verify if the debug is correctly enabled and test default http port - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/messaging/quarkus-app/quarkus-run.jar - - Scenario: Verify if the explainability rest binary is selected by the enviroment variable EXPLAINABILITY_COMMUNICATION - When container is started with env - | variable | value | - | EXPLAINABILITY_COMMUNICATION | rest | - | SCRIPT_DEBUG | true | - Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/rest/quarkus-app/quarkus-run.jar - - Scenario: Verify if the communication is correctly set to its default value if a wrong communication type is set - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | EXPLAINABILITY_COMMUNICATION | nonsense | - Then container log should contain WARN Explainability communication type nonsense is not allowed, the allowed types are [REST MESSAGING]. Defaulting to MESSAGING. diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature index 288357b74..96c72b707 100644 --- a/tests/features/kogito-swf-builder.feature +++ b/tests/features/kogito-swf-builder.feature @@ -1,5 +1,4 @@ @quay.io/kiegroup/kogito-swf-builder -@openshift-serverless-1-tech-preview/logic-swf-builder-rhel8 Feature: Serverless Workflow builder images Scenario: Verify that the application is built and started correctly diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature index 391be6e4e..65bc98115 100644 --- a/tests/features/kogito-swf-common.feature +++ b/tests/features/kogito-swf-common.feature @@ -1,7 +1,5 @@ @quay.io/kiegroup/kogito-swf-builder @quay.io/kiegroup/kogito-swf-devmode -@openshift-serverless-1-tech-preview/logic-swf-builder-rhel8 -@openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8 Feature: Serverless Workflow images common Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature index 1ae248b36..533521167 100644 --- a/tests/features/kogito-swf-devmode.feature +++ b/tests/features/kogito-swf-devmode.feature @@ -1,5 +1,4 @@ @quay.io/kiegroup/kogito-swf-devmode -@openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8 Feature: Serverless Workflow devmode images Scenario: Verify if container starts in devmode by default diff --git a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature deleted file mode 100644 index 6f62ba9e6..000000000 --- a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature +++ /dev/null @@ -1,26 +0,0 @@ -@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8 -Feature: logic-data-index-ephemeral-rhel8 feature - - Scenario: verify if all labels are correctly set on logic-data-index-ephemeral-rhel8 image - Given image is built - Then the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label maintainer with value Apache KIE - And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider - And the image should contain label io.k8s.display-name with value Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL - And the image should contain label io.openshift.tags with value logic-data-index,kogito,data-index,data-index-ephemeral - And the image should contain label com.redhat.component with value openshift-serverless-1-logic-data-index-ephemeral-rhel8-container - - Scenario: verify if of logic-data-index-ephemeral-rhel8 container is correctly started - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - Then container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar - And container log should contain Embedded Postgres started at port - And container log should not contain Application failed to start - - Scenario: check if the default quarkus profile is correctly set on data index - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - Then container log should contain -Dquarkus.profile=http-events-support - diff --git a/tests/features/openshift-serverless-logic/logic-swf-builder.feature b/tests/features/openshift-serverless-logic/logic-swf-builder.feature deleted file mode 100644 index 8d1f847c3..000000000 --- a/tests/features/openshift-serverless-logic/logic-swf-builder.feature +++ /dev/null @@ -1,11 +0,0 @@ -@openshift-serverless-1-tech-preview/logic-swf-builder-rhel8 -Feature: logic-swf-builder-rhel8 feature - - Scenario: verify if all labels are correctly set on logic-swf-builder-rhel8 image - Given image is built - Then the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label maintainer with value Apache KIE - And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled - And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic Builder image - And the image should contain label io.openshift.tags with value logic-swf-builder,kogito,swf-builder - And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-builder-rhel8-container diff --git a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature deleted file mode 100644 index e67a7c51f..000000000 --- a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature +++ /dev/null @@ -1,11 +0,0 @@ -@openshift-serverless-1-tech-preview/logic-swf-devmode-rhel8 -Feature: logic-swf-devmode-rhel8 feature - - Scenario: verify if all labels are correctly set on logic-swf-devmode-rhel8 image - Given image is built - Then the image should contain label io.openshift.expose-services with value 8080:http,5005:http - And the image should contain label maintainer with value Apache KIE - And the image should contain label io.k8s.description with value Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled. - And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic SWF Devmode - And the image should contain label io.openshift.tags with value logic,devmode,kogito,kogito,development,serverless,workflow - And the image should contain label com.redhat.component with value openshift-serverless-1-logic-swf-devmode-rhel8-container \ No newline at end of file diff --git a/tests/features/rhpam-kogito-builder-jvm.feature b/tests/features/rhpam-kogito-builder-jvm.feature deleted file mode 100644 index 68bb639a9..000000000 --- a/tests/features/rhpam-kogito-builder-jvm.feature +++ /dev/null @@ -1,108 +0,0 @@ -@rhpam-7/rhpam-kogito-builder-rhel8 -Feature: rhpam-kogito-builder-rhel8 feature. - - Scenario: verify if all labels are correctly set on rhpam-kogito-builder-rhel8 image - Given image is built - # Then the image should not contain label maintainer TODO add support to this sentence on cekit behave steps - Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i - And the image should contain label io.openshift.s2i.destination with value /tmp - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value RHPAM Platform for building Kogito based on Quarkus or Spring Boot - And the image should contain label io.k8s.display-name with value Red Hat build of Kogito builder based on Quarkus or SpringBoot - And the image should contain label io.openshift.tags with value rhpam-kogito,builder,kogito,quarkus,springboot - And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin - And the image should contain label com.redhat.component with value rhpam-7-kogito-builder-rhel8-container - - Scenario: verify if prod builder image contains the red hat maven repositories - When container is started with command bash - Then file /home/kogito/.m2/settings.xml should contain redhat-maven-repositories - And file /home/kogito/.m2/settings.xml should contain redhat-maven-repositories - And file /home/kogito/.m2/settings.xml should contain redhat-ga-repository - And file /home/kogito/.m2/settings.xml should contain https://maven.repository.redhat.com/ga/ - And file /home/kogito/.m2/settings.xml should contain redhat-ea-repository - And file /home/kogito/.m2/settings.xml should contain https://maven.repository.redhat.com/earlyaccess/all/ - And file /home/kogito/.m2/settings.xml should contain redhat-techpreview-repository - And file /home/kogito/.m2/settings.xml should contain https://maven.repository.redhat.com/techpreview/all - - Scenario: Check if the expected message is printed if native build is enabled - Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest - | variable | value | - | RUNTIME_TYPE | quarkus | - | NATIVE | true | - | KOGITO_VERSION | 999-SNAPSHOT | - Then s2i build log should contain Container Image rhpam-7/rhpam-kogito-builder-rhel8 does not supports native builds, please refer to the documentation. - - Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly - Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest - | variable | value | - | RUNTIME_TYPE | quarkus | - | NATIVE | false | - | KOGITO_VERSION | 999-SNAPSHOT | - Then file /home/kogito/bin/quarkus-run.jar should exist - And s2i build log should contain Generating quarkus project structure for project... - And s2i build log should contain Using Quarkus com.redhat.quarkus.platform:quarkus-maven-plugin - And check that page is served - | property | value | - | port | 8080 | - | path | /Traffic%20Violation | - | wait | 80 | - | expected_phrase | Should the driver be suspended? | - | request_method | POST | - | content_type | application/json | - | request_body | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} | - And check that page is served - | property | value | - | port | 8080 | - | path | /q/health/live | - | wait | 80 | - | request_method | GET | - | content_type | application/json | - | request_body | {"status": "UP", "checks": []} | - - Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly with custom group id, archetype & version - Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest - | variable | value | - | RUNTIME_TYPE | quarkus | - | NATIVE | false | - | KOGITO_VERSION | 999-SNAPSHOT | - | PROJECT_GROUP_ID | com.mycompany | - | PROJECT_ARTIFACT_ID | myproject | - | PROJECT_VERSION | 2.0-SNAPSHOT | - Then file /home/kogito/bin/quarkus-run.jar should exist - And s2i build log should contain Generating quarkus project structure for myproject... - And check that page is served - | property | value | - | port | 8080 | - | path | /Traffic%20Violation | - | wait | 80 | - | expected_phrase | Should the driver be suspended? | - | request_method | POST | - | content_type | application/json | - | request_body | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} | - -#### SpringBoot Scenarios - - Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly when runtime is springboot - Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image rhpam-7/rhpam-kogito-runtime-jvm-rhel8:latest - | variable | value | - | KOGITO_VERSION | 999-SNAPSHOT | - | RUNTIME_TYPE | springboot | - Then file /home/kogito/bin/project-1.0-SNAPSHOT.jar should exist - And s2i build log should contain Generating springboot project structure for project... - And check that page is served - | property | value | - | port | 8080 | - | path | /Traffic%20Violation | - | wait | 80 | - | expected_phrase | Should the driver be suspended? | - | request_method | POST | - | content_type | application/json | - | request_body | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} | - And check that page is served - | property | value | - | port | 8080 | - | path | /actuator/health | - | wait | 80 | - | request_method | GET | - | content_type | application/json | - | request_body | {"status":"UP"} | diff --git a/tests/features/rhpam-kogito-runtime-jvm.feature b/tests/features/rhpam-kogito-runtime-jvm.feature deleted file mode 100644 index e077dffaf..000000000 --- a/tests/features/rhpam-kogito-runtime-jvm.feature +++ /dev/null @@ -1,16 +0,0 @@ -@rhpam-7/rhpam-kogito-runtime-jvm-rhel8 -Feature: rhpam-kogito-runtime-jvm feature. - - Scenario: verify if all labels are correctly set on rhpam-kogito-runtime-jvm-rhel8 image - Given image is built - # Then the image should not contain label maintainer TODO add support to this sentence on cekit behave steps - Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i - And the image should contain label io.openshift.s2i.destination with value /tmp - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value RHPAM Runtime image for Kogito based on Quarkus or Spring Boot JVM image - And the image should contain label io.k8s.display-name with value Red Hat build of Kogito runtime based on Quarkus or SpringBoot JVM image - And the image should contain label io.openshift.tags with value rhpam-kogito,runtime,kogito,quarkus,springboot,jvm - And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin - And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-jvm-rhel8-container - - diff --git a/tests/features/rhpam-kogito-runtime-native.feature b/tests/features/rhpam-kogito-runtime-native.feature deleted file mode 100644 index 9e3dc8fd1..000000000 --- a/tests/features/rhpam-kogito-runtime-native.feature +++ /dev/null @@ -1,15 +0,0 @@ -@rhpam-7/rhpam-kogito-runtime-native-rhel8 -Feature: rhpam-kogito-runtime-jvm feature. - - Scenario: verify if all labels are correctly set on rhpam-kogito-runtime-jvm-rhel8 image - Given image is built - # Then the image should not contain label maintainer TODO add support to this sentence on cekit behave steps - Then the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i - And the image should contain label io.openshift.s2i.destination with value /tmp - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value RHPAM Runtime image for Kogito based on Quarkus native image - And the image should contain label io.k8s.display-name with value Red Hat build of Kogito runtime based on Quarkus native image - And the image should contain label io.openshift.tags with value rhpam-kogito,runtime,kogito,quarkus,native - And the image should contain label io.openshift.s2i.assemble-input-files with value /home/kogito/bin - And the image should contain label com.redhat.component with value rhpam-7-kogito-runtime-native-rhel8-container - diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature index d2e73b03e..8b32e8ed9 100644 --- a/tests/features/supporting-services-common.feature +++ b/tests/features/supporting-services-common.feature @@ -1,16 +1,8 @@ @quay.io/kiegroup/kogito-management-console @quay.io/kiegroup/kogito-task-console @quay.io/kiegroup/kogito-data-index-ephemeral -@quay.io/kiegroup/kogito-data-index-infinispan -@quay.io/kiegroup/kogito-data-index-mongodb -@quay.io/kiegroup/kogito-data-index-oracle @quay.io/kiegroup/kogito-data-index-postgresql -@quay.io/kiegroup/kogito-trusty-infinispan -@quay.io/kiegroup/kogito-trusty-postgresql -@quay.io/kiegroup/kogito-trusty-redis -@quay.io/kiegroup/kogito-trusty-ui @quay.io/kiegroup/kogito-jit-runner -@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8 Feature: kogito supporting services common feature Scenario: Verify if the application jar exists diff --git a/tests/features/trusty/kogito-trusty-common.feature b/tests/features/trusty/kogito-trusty-common.feature deleted file mode 100644 index ac5e551dc..000000000 --- a/tests/features/trusty/kogito-trusty-common.feature +++ /dev/null @@ -1,10 +0,0 @@ -@quay.io/kiegroup/kogito-trusty-infinispan -@quay.io/kiegroup/kogito-trusty-redis -@quay.io/kiegroup/kogito-trusty-postgresql -Feature: Kogito-trusty common feature. - Scenario: Scenario: Verify if the debug is correctly enabled and test default http port - When container is started with args - | arg | value | - | command | bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh" | - | env_json | {"SCRIPT_DEBUG":"true"} | - Then container log should contain -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature deleted file mode 100644 index dbf213ec9..000000000 --- a/tests/features/trusty/kogito-trusty-infinispan.feature +++ /dev/null @@ -1,36 +0,0 @@ -@quay.io/kiegroup/kogito-trusty-infinispan -Feature: Kogito-trusty infinispan feature. - - Scenario: verify if all labels are correctly set on kogito-trusty-infinispan image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Infinispan persistence provider - And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Infinispan - And the image should contain label io.openshift.tags with value kogito,trusty,trusty-infinispan - - Scenario: Verify if the explainability messaging is disabled - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | EXPLAINABILITY_ENABLED | false | - Then container log should contain -Dtrusty.explainability.enabled=false -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar - - Scenario: verify if auth is correctly set - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | ENABLE_PERSISTENCE | true | - | QUARKUS_INFINISPAN_CLIENT_HOSTS | 172.18.0.1:11222 | - | QUARKUS_INFINISPAN_CLIENT_USE_AUTH | true | - | QUARKUS_INFINISPAN_CLIENT_USERNAME | IamNotExist | - | QUARKUS_INFINISPAN_CLIENT_PASSWORD | hard2guess | - | QUARKUS_INFINISPAN_CLIENT_AUTH_REALM | SecretRealm | - | QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM | COOLGSSAPI | - Then container log should contain QUARKUS_INFINISPAN_CLIENT_HOSTS=172.18.0.1:11222 - Then container log should contain QUARKUS_INFINISPAN_CLIENT_USE_AUTH=true - And container log should contain QUARKUS_INFINISPAN_CLIENT_PASSWORD=hard2guess - And container log should contain QUARKUS_INFINISPAN_CLIENT_USERNAME=IamNotExist - And container log should contain QUARKUS_INFINISPAN_CLIENT_AUTH_REALM=SecretReal - And container log should contain QUARKUS_INFINISPAN_CLIENT_SASL_MECHANISM=COOLGSSAPI - And container log should not contain Application failed to start diff --git a/tests/features/trusty/kogito-trusty-postgresql.feature b/tests/features/trusty/kogito-trusty-postgresql.feature deleted file mode 100644 index a2224fbcd..000000000 --- a/tests/features/trusty/kogito-trusty-postgresql.feature +++ /dev/null @@ -1,11 +0,0 @@ -@quay.io/kiegroup/kogito-trusty-postgresql -Feature: Kogito-trusty postgresql feature. - - Scenario: verify if all labels are correctly set on kogito-trusty-postgresql image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for PostgreSQL persistence provider - And the image should contain label io.k8s.display-name with value Kogito Trusty Service - PostgreSQL - And the image should contain label io.openshift.tags with value kogito,trusty,trusty-postgresql - diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature deleted file mode 100644 index f39b831e8..000000000 --- a/tests/features/trusty/kogito-trusty-redis.feature +++ /dev/null @@ -1,18 +0,0 @@ -@quay.io/kiegroup/kogito-trusty-redis -Feature: Kogito-trusty redis feature. - - Scenario: verify if all labels are correctly set on kogito-trusty-redis image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Redis persistence provider - And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Redis - And the image should contain label io.openshift.tags with value kogito,trusty,trusty-redis - - Scenario: verify if all parameters are correctly set - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | KOGITO_PERSISTENCE_REDIS_URL | redis://127.0.0.1:6379 | - Then container log should contain KOGITO_PERSISTENCE_REDIS_URL=redis://127.0.0.1:6379 - And container log should contain -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar \ No newline at end of file diff --git a/tests/features/trusty/kogito-trusty-ui.feature b/tests/features/trusty/kogito-trusty-ui.feature deleted file mode 100644 index 1aa3a978c..000000000 --- a/tests/features/trusty/kogito-trusty-ui.feature +++ /dev/null @@ -1,30 +0,0 @@ -@quay.io/kiegroup/kogito-trusty-ui -Feature: kogito-trusty-ui feature - - Scenario: verify if all labels are correctly set on kogito-trusty-ui image - Given image is built - Then the image should contain label maintainer with value Apache KIE - And the image should contain label io.openshift.expose-services with value 8080:http - And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty UI, manage your Business Process easily. - And the image should contain label io.k8s.display-name with value Kogito Trusty UI - And the image should contain label io.openshift.tags with value kogito,trusty,trusty-ui - - Scenario: Verify if the debug is correctly enabled and test default http port - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - Then container log should contain -Dkogito.trusty.http.url=http://localhost:8180 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar - And container log should contain Trusty url not set, default will be used: http://localhost:8180 - And container log should contain started in - And container log should not contain Application failed to start - - Scenario: Verify if the debug is correctly enabled and set trusty url - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | KOGITO_TRUSTY_ENDPOINT | http://test:9090 | - Then container log should contain -Dkogito.trusty.http.url=http://test:9090 -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/quarkus-app/quarkus-run.jar - And container log should not contain Trusty url not set, default will be used: http://localhost:8180 - And container log should contain started in - And container log should not contain Application failed to start - diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh index 4a9fdfc53..13e108ae1 100755 --- a/tests/test-apps/clone-repo.sh +++ b/tests/test-apps/clone-repo.sh @@ -25,12 +25,8 @@ IMAGE_NAME="$2" KOGITO_EXAMPLES_REPO_NAME='incubator-kie-kogito-examples' KOGITO_EXAMPLES_FOLDER_NAME='kogito-examples' # many tests rely on location /tmp/kogito-examples -prod="" if [ -n "${IMAGE_NAME}" ]; then - if [[ ${IMAGE_NAME} =~ rhpam|logic* ]]; then - prod="--prod" - fi - if python ../../scripts/list-images.py ${prod} -is ${IMAGE_NAME}; then + if python ../../scripts/list-images.py -is ${IMAGE_NAME}; then echo "Target image is supporting services, skipping examples build" exit 0 fi