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 f61da8c41..f511a8d40 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,19 +81,19 @@ 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. * if any dependency is missing CeKit will tell which one. * [Bats](https://github.com/sstephenson/bats) - * Java 11 or higher - * Maven 3.8.6 or higher + * Java 17 or higher + * Maven 3.9.3 or higher * Optional dependencies: * [source-to-image](https://github.com/openshift/source-to-image) * used to perform local s2i images using some of the [builder images](#builder-images) - * [GraalVM 22.2.0](https://github.com/graalvm/graalvm-ce-builds/releases/tag/vm-22.2.0) Java 11 or higher + * [GraalVM 23+](https://github.com/graalvm/mandrel/releases) Java 17 or higher * Useful to test Kogito apps on native mode before create a Container image with it. * [OpenShift Cli](https://docs.openshift.com/container-platform/4.3/cli_reference/openshift_cli/getting-started-cli.html) @@ -145,8 +142,8 @@ There are three builder images available: * [quay.io/kiegroup/kogito-base-builder](https://quay.io/kiegroup/kogito-base-builder) The Kogito base Builder Image is equipped with the following components: - * OpenJDK 11.0.6 - * Maven 3.8.6 + * OpenJDK 17.x + * Maven 3.9.3 * [quay.io/kiegroup/kogito-swf-builder](https://quay.io/kiegroup/kogito-swf-builder) The Kogito SWF Builder Image extends the kogito-base-builder is equipped with the following components for faster builds: @@ -162,15 +159,15 @@ When `RUNTIME_TYPE` quarkus is chosen, the Builder Image allows you to create a The Kogito s2i Builder Image is equipped with the following components: - * GraalVM 22.2.0-java11 - * OpenJDK 11+ - * Maven 3.8.6 + * GraalVM 23+ + * OpenJDK 17+ + * Maven 3.9.3 For more information about what is installed on this image, take a look [here](kogito-s2i-builder-image.yaml) in the **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) @@ -627,44 +615,19 @@ Today we have 16 Kogito Component Images: The Data Index Service aims at capturing and indexing data produced by one more Kogito runtime services. For more information please visit this (link)(https://docs.jboss.org/kogito/release/latest/html_single/#proc-kogito-travel-agency-enable-data-index_kogito-deploying-on-openshift). -The Data Index Service depends on a running Infinispan, MongoDB or PostgreSQL. +The Data Index Service depends on a PostgreSQL instance. 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 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,22 +669,19 @@ $ 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. The ephemeral image does not have external dependencies like a backend persistence provider, it uses in-memory persistence -while working with Jobs Services `allinone`, `infinispan`, `mongodb` and `postgresql` variants, it will need to -have an Infinispan, MongoDB or PostgreSQL server, respectively, previously running. +while working with Jobs Services `postgresql` variant, it will need to have a PostgreSQL server previously running. #### Jobs Services All-in-one The Jobs Services All in One image provides the option to run any supported variant that we have at disposal, which are: - PostgreSQL -- Infinispan -- MongoDB - Ephemeral (default if no variant is specified) There are 3 exposed environment variables that can be used to configure the behaviour, which are: @@ -877,31 +770,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 +819,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 +1006,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 +1068,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 +1095,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 +1203,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...... ``` @@ -1443,4 +1274,4 @@ Master PR: 0.9.x PR cherry picker from main: [0.9.x][KOGITO-XXXX] - Description of the Issue -``` +``` \ No newline at end of file diff --git a/container.yaml b/container.yaml index deb7d3dad..064e9952f 100644 --- a/container.yaml +++ b/container.yaml @@ -1,3 +1,21 @@ +# +# 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. +# --- platforms: only: diff --git a/content_sets.yaml b/content_sets.yaml index 1ec60caba..c57d57bc3 100644 --- a/content_sets.yaml +++ b/content_sets.yaml @@ -1,3 +1,21 @@ +# +# 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. +# # This is a file defining which content sets (yum repositories) are needed to # update content in this image. Data provided here helps determine which images # are vulnerable to specific CVEs. Generally you should only need to update this diff --git a/contrib/jobs-service/container-compose-infinispan.yaml b/contrib/jobs-service/container-compose-infinispan.yaml deleted file mode 100644 index 9e2258d55..000000000 --- a/contrib/jobs-service/container-compose-infinispan.yaml +++ /dev/null @@ -1,28 +0,0 @@ -services: - infinispan: - image: infinispan/server:14.0.4.Final - container_name: infinispan - ports: - - "11222:11222" - command: "-c infinispan-demo.xml" - volumes: - - ./infinispan/infinispan.xml:/opt/infinispan/server/conf/infinispan-demo.xml - healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:11222/rest/v2/cache-managers/default/health/status" ] - interval: 1s - timeout: 1s - retries: 50 - - jobs-service-all-in-one: - image: quay.io/kiegroup/kogito-jobs-service-allinone:latest - container_name: jobs-service - ports: - - "8080:8080" - depends_on: - infinispan: - condition: service_healthy - environment: - JOBS_SERVICE_PERSISTENCE: infinispan - KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false" - QUARKUS_INFINISPAN_CLIENT_HOSTS: infinispan:11222 - QUARKUS_INFINISPAN_CLIENT_USE_AUTH: "false" \ No newline at end of file diff --git a/contrib/jobs-service/container-compose-mongodb.yaml b/contrib/jobs-service/container-compose-mongodb.yaml deleted file mode 100644 index bad8f3e97..000000000 --- a/contrib/jobs-service/container-compose-mongodb.yaml +++ /dev/null @@ -1,36 +0,0 @@ -services: - mongo: - image: mongo - container_name: mongo - restart: always - environment: - MONGO_INITDB_ROOT_USERNAME: root - MONGO_INITDB_ROOT_PASSWORD: example - - mongo-express: - image: mongo-express - container_name: mongo-express - restart: always - ports: - - 8081:8081 - environment: - ME_CONFIG_MONGODB_ADMINUSERNAME: root - ME_CONFIG_MONGODB_ADMINPASSWORD: example - ME_CONFIG_MONGODB_URL: mongodb://root:example@mongo:27017/ - - jobs-service-all-in-one: - image: quay.io/kiegroup/kogito-jobs-service-allinone:latest - container_name: jobs-service - ports: - - "8080:8080" - depends_on: - - mongo - environment: - JOBS_SERVICE_PERSISTENCE: mongodb - QUARKUS_MONGODB_CONNECTION_STRING: mongodb://mongo:27017 - QUARKUS_MONGODB_DATABASE: kogito - MONGODB_HOST: mongodb:27017 - QUARKUS_MONGODB_CREDENTIALS_USERNAME: root - QUARKUS_MONGODB_CREDENTIALS_PASSWORD: example - QUARKUS_MONGODB_CREDENTIALS_AUTH_SOURCE: admin - KOGITO_JOBS_SERVICE_KNATIVE_EVENTS: "false" \ No newline at end of file diff --git a/contrib/jobs-service/container-compose-postgresql.yaml b/contrib/jobs-service/container-compose-postgresql.yaml index d3e022c14..4f2b8026f 100644 --- a/contrib/jobs-service/container-compose-postgresql.yaml +++ b/contrib/jobs-service/container-compose-postgresql.yaml @@ -1,3 +1,21 @@ +# +# 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. +# services: postgres: image: postgres:13.4-alpine3.14 diff --git a/contrib/jobs-service/infinispan/infinispan.xml b/contrib/jobs-service/infinispan/infinispan.xml deleted file mode 100644 index 726675509..000000000 --- a/contrib/jobs-service/infinispan/infinispan.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml index 88be045bc..9390018b4 100644 --- a/kogito-base-builder-image.yaml +++ b/kogito-base-builder-image.yaml @@ -1,7 +1,25 @@ +# +# 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-base-builder" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !" @@ -13,9 +31,9 @@ labels: - name: "io.openshift.expose-services" value: "8080:http" - name: "io.quarkus.platform.version" - value: "2.16.10.Final" + value: "3.2.9.Final" - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -37,10 +55,11 @@ modules: - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven - version: "3.8.6" + version: "3.9.3" + - name: org.kie.kogito.maven.common - name: org.kie.kogito.project.versions - name: org.kie.kogito.security.custom.truststores diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml index 00e9f7233..5cd7606f6 100644 --- a/kogito-data-index-ephemeral-image.yaml +++ b/kogito-data-index-ephemeral-image.yaml @@ -1,13 +1,31 @@ +# +# 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-ephemeral" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider" labels: - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -38,7 +56,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.dataindex.community.ephemeral diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml deleted file mode 100644 index e8ebd3122..000000000 --- a/kogito-data-index-infinispan-image.yaml +++ /dev/null @@ -1,71 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-data-index-infinispan" -version: "2.0.0-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: "2.0.0-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: "11" - - 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 ff9d55d61..000000000 --- a/kogito-data-index-mongodb-image.yaml +++ /dev/null @@ -1,53 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-data-index-mongodb" -version: "2.0.0-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: "2.0.0-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: "11" - - 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 af4c192de..000000000 --- a/kogito-data-index-oracle-image.yaml +++ /dev/null @@ -1,53 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-data-index-oracle" -version: "2.0.0-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: "2.0.0-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: "11" - - 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-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml index e7ba4fb41..a0852f996 100644 --- a/kogito-data-index-postgresql-image.yaml +++ b/kogito-data-index-postgresql-image.yaml @@ -1,14 +1,32 @@ +# +# 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-postgresql" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider" labels: - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -39,7 +57,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.dataindex.postgresql diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml deleted file mode 100644 index 059c6685d..000000000 --- a/kogito-explainability-image.yaml +++ /dev/null @@ -1,55 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-explainability" -version: "2.0.0-snapshot" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Explainability Service" - -labels: - - name: "org.kie.kogito.version" - value: "2.0.0-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: "11" - - 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 6aa1d573e..139458273 100644 --- a/kogito-imagestream.yaml +++ b/kogito-imagestream.yaml @@ -1,3 +1,21 @@ +# +# 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: @@ -15,18 +33,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Runtime image for Kogito based on Quarkus native image iconClass: icon-jbpm tags: runtime,kogito,quarkus supports: quarkus - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-runtime-native:2.0.0-snapshot + name: quay.io/kiegroup/kogito-runtime-native:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -36,18 +54,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Runtime image for Kogito based on Quarkus or Springboot JVM image iconClass: icon-jbpm tags: runtime,kogito,quarkus,springboot,jvm supports: quarkus - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-runtime-jvm:2.0.0-snapshot + name: quay.io/kiegroup/kogito-runtime-jvm:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -57,18 +75,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Platform for building Kogito based on Quarkus or Springboot iconClass: icon-jbpm tags: s2i-builder,kogito,quarkus,springboot supports: quarkus - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-s2i-builder:2.0.0-snapshot + name: quay.io/kiegroup/kogito-s2i-builder:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -78,18 +96,18 @@ items: openshift.io/provider-display-name: KIE Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Kogito Serverless Workflow builder with minimum Quarkus extensions libraries preinstalled iconClass: icon-jbpm tags: kogito,quarkus,swf,maven supports: quarkus - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-swf-builder:2.0.0-snapshot + name: quay.io/kiegroup/kogito-swf-builder:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -99,39 +117,18 @@ items: openshift.io/provider-display-name: KIE Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Kogito base builder iconClass: icon-jbpm tags: kogito,jdk,maven supports: quarkus - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-base-builder:2.0.0-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: '2.0.0-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: '2.0.0-snapshot' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-data-index-infinispan:2.0.0-snapshot + name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -141,39 +138,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Runtime image for the Kogito Data Index Service with ephemeral PostgreSQL iconClass: icon-jbpm tags: kogito,data-index,data-index-ephemeral supports: persistence backed by ephemeral PostgreSQL Server - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-data-index-ephemeral:2.0.0-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: '2.0.0-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: '2.0.0-snapshot' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-data-index-mongodb:2.0.0-snapshot + name: quay.io/kiegroup/kogito-data-index-ephemeral:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -183,102 +159,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Runtime image for the Kogito Data Index Service with PostgreSQL iconClass: icon-jbpm tags: kogito,data-index,data-index-postgresql supports: persistence backed by PostgreSQL server - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-data-index-postgresql:2.0.0-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: '2.0.0-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: '2.0.0-snapshot' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-trusty-infinispan:2.0.0-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: '2.0.0-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: '2.0.0-snapshot' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-trusty-redis:2.0.0-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: '2.0.0-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: '2.0.0-snapshot' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-trusty-postgresql:2.0.0-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: '2.0.0-snapshot' - annotations: - description: Runtime image for the Kogito Trusty UI Service - iconClass: icon-jbpm - tags: kogito,trusty-ui - supports: Audit UI - version: '2.0.0-snapshot' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-trusty-ui:2.0.0-snapshot + name: quay.io/kiegroup/kogito-data-index-postgresql:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -288,39 +180,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Runtime image for the Kogito JIT Runner iconClass: icon-jbpm tags: kogito,jit-runner supports: JIT Runner - version: '2.0.0-snapshot' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-jit-runner:2.0.0-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: '2.0.0-snapshot' - annotations: - description: Runtime image for the Kogito Explainability Service - iconClass: icon-jbpm - tags: kogito,explainability - supports: explainability for decisions - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-explainability:2.0.0-snapshot + name: quay.io/kiegroup/kogito-jit-runner:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -330,60 +201,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Runtime image for Kogito in memory Jobs Service iconClass: icon-jbpm tags: kogito,jobs-service supports: out-of-box process timers - version: '2.0.0-snapshot' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-ephemeral:2.0.0-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: '2.0.0-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: '2.0.0-snapshot' - referencePolicy: - type: Local - from: - kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-infinispan:2.0.0-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: '2.0.0-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: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-mongodb:2.0.0-snapshot + name: quay.io/kiegroup/kogito-jobs-service-ephemeral:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -393,18 +222,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Runtime image for Kogito Jobs Service based on Postgresql iconClass: icon-jbpm tags: kogito,jobs-service supports: out-of-box process timers - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-postgresql:2.0.0-snapshot + name: quay.io/kiegroup/kogito-jobs-service-postgresql:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -414,18 +243,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: All in One Runtime image for Kogito Jobs Service iconClass: icon-jbpm tags: kogito,jobs-service, all-in-one supports: out-of-box process timers - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-allinone:2.0.0-snapshot + name: quay.io/kiegroup/kogito-jobs-service-allinone:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -435,18 +264,18 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Runtime image for the Kogito Management Console iconClass: icon-jbpm tags: kogito,management-console supports: business process management - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-management-console:2.0.0-snapshot + name: quay.io/kiegroup/kogito-management-console:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -456,15 +285,15 @@ items: openshift.io/provider-display-name: Kie Group. spec: tags: - - name: '2.0.0-snapshot' + - name: '999-SNAPSHOT' annotations: description: Runtime image for the Kogito Task Console iconClass: icon-jbpm tags: kogito,task-console supports: business process management - version: '2.0.0-snapshot' + version: '999-SNAPSHOT' referencePolicy: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-task-console:2.0.0-snapshot + name: quay.io/kiegroup/kogito-task-console:999-SNAPSHOT diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml index 423ac0ff4..801539ae3 100644 --- a/kogito-jit-runner-image.yaml +++ b/kogito-jit-runner-image.yaml @@ -1,13 +1,31 @@ +# +# 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-jit-runner" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito JIT Runner" labels: - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -35,7 +53,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jit-runner diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml index 60c360fb1..0db23c680 100644 --- a/kogito-jobs-service-allinone-image.yaml +++ b/kogito-jobs-service-allinone-image.yaml @@ -1,13 +1,31 @@ +# +# 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-allinone" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito Jobs Service with all available jdbc providers" labels: - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -15,7 +33,7 @@ labels: - name: "io.k8s.display-name" value: "Kogito Jobs Service All-in-One" - name: "io.openshift.tags" - value: "kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral" + value: "kogito,jobs-service,postgresql,ephemeral" - name: "io.openshift.expose-services" value: "8080:http" @@ -27,8 +45,8 @@ envs: 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." - name: "JOBS_SERVICE_PERSISTENCE" - example: "mongodb" - description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral, postgresql, mongodb and infinispan, if empty, defaults to ephemeral" + example: "postgresql" + description: "The all in one image contains all the supported jdbc plugins for Jobs Service, ephemeral and postgresql, if empty, defaults to ephemeral" packages: manager: microdnf @@ -41,7 +59,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jobs.service.allinone diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml index 5975572e6..b6b5bd6c8 100644 --- a/kogito-jobs-service-ephemeral-image.yaml +++ b/kogito-jobs-service-ephemeral-image.yaml @@ -1,13 +1,31 @@ +# +# 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-ephemeral" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito in memory Jobs Service" labels: - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -38,7 +56,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jobs.service.ephemeral diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml deleted file mode 100644 index 5ab15692a..000000000 --- a/kogito-jobs-service-infinispan-image.yaml +++ /dev/null @@ -1,55 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-jobs-service-infinispan" -version: "2.0.0-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: "2.0.0-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: "11" - - 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 d83a45841..000000000 --- a/kogito-jobs-service-mongodb-image.yaml +++ /dev/null @@ -1,55 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-jobs-service-mongodb" -version: "2.0.0-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: "2.0.0-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: "11" - - 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-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml index 56ea62d81..b13f52043 100644 --- a/kogito-jobs-service-postgresql-image.yaml +++ b/kogito-jobs-service-postgresql-image.yaml @@ -1,13 +1,31 @@ +# +# 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-postgresql" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito Jobs Service based on Postgresql" labels: - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -38,7 +56,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.jobs.service.postgresql diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml index 3a4de549f..3e4c14f3e 100644 --- a/kogito-management-console-image.yaml +++ b/kogito-management-console-image.yaml @@ -1,13 +1,31 @@ +# +# 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-management-console" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito Management Console" labels: - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -38,7 +56,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.management.console diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml index 8871487f1..f147c77fc 100644 --- a/kogito-runtime-jvm-image.yaml +++ b/kogito-runtime-jvm-image.yaml @@ -1,7 +1,25 @@ +# +# 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-runtime-jvm" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito based on Quarkus or Springboot JVM image" @@ -13,9 +31,9 @@ labels: - name: "io.openshift.expose-services" value: "8080:http" - name: "io.quarkus.platform.version" - value: "2.16.10.Final" + value: "3.2.9.Final" - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -50,7 +68,7 @@ modules: - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.project.versions - name: org.kie.kogito.s2i.core diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml index 62139b82f..336ec9107 100644 --- a/kogito-runtime-native-image.yaml +++ b/kogito-runtime-native-image.yaml @@ -1,7 +1,25 @@ +# +# 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-runtime-native" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito based on Quarkus native image" @@ -13,9 +31,9 @@ labels: - name: "io.openshift.expose-services" value: "8080:http" - name: "io.quarkus.platform.version" - value: "2.16.10.Final" + value: "3.2.9.Final" - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml index 7c4b288ad..055f28be9 100644 --- a/kogito-s2i-builder-image.yaml +++ b/kogito-s2i-builder-image.yaml @@ -1,7 +1,25 @@ +# +# 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-s2i-builder" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Platform for building Kogito based on Quarkus or Springboot" @@ -13,9 +31,9 @@ labels: - name: "io.openshift.expose-services" value: "8080:http" - name: "io.quarkus.platform.version" - value: "2.16.10.Final" + value: "3.2.9.Final" - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -62,14 +80,15 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.graalvm.java11.installer - version: "22.3" - - name: org.kie.kogito.graalvm.scripts + - name: org.kie.kogito.graalvm.java17.installer + version: "23.0" + - name: org.kie.kogito.graalvm.common.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven - version: "3.8.6" + version: "3.9.3" + - name: org.kie.kogito.maven.common - name: org.kie.kogito.project.versions - name: org.kie.kogito.s2i.core - name: org.kie.kogito.s2i.builder diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml index 421d04480..a937e26ae 100644 --- a/kogito-swf-builder-image.yaml +++ b/kogito-swf-builder-image.yaml @@ -1,6 +1,24 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# - name: builder from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" - version: "2.0.0-snapshot" + version: "999-SNAPSHOT" modules: repositories: - path: modules @@ -10,10 +28,11 @@ - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven - version: "3.8.6" + version: "3.9.3" + - name: org.kie.kogito.maven.common - name: org.kie.kogito.project.versions - name: org.kie.kogito.swf.common.scripts - name: org.kie.kogito.swf.builder.build-config @@ -24,7 +43,7 @@ - name: "quay.io/kiegroup/kogito-swf-builder" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" - version: "2.0.0-snapshot" + version: "999-SNAPSHOT" description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled" labels: @@ -33,9 +52,9 @@ - name: "io.openshift.s2i.destination" value: "/tmp" - name: "io.quarkus.platform.version" - value: "2.16.10.Final" + value: "3.2.9.Final" - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -57,10 +76,11 @@ - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven - version: "3.8.6" + version: "3.9.3" + - name: org.kie.kogito.maven.common - name: org.kie.kogito.project.versions - name: org.kie.kogito.swf.common.scripts - name: org.kie.kogito.swf.builder.runtime.community diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml index 2503a8699..6f4346810 100644 --- a/kogito-swf-devmode-image.yaml +++ b/kogito-swf-devmode-image.yaml @@ -1,6 +1,24 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# - name: builder from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" - version: "2.0.0-snapshot" + version: "999-SNAPSHOT" modules: repositories: - path: modules @@ -10,10 +28,11 @@ - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven - version: "3.8.6" + version: "3.9.3" + - name: org.kie.kogito.maven.common - name: org.kie.kogito.project.versions - name: org.kie.kogito.swf.common.scripts - name: org.kie.kogito.swf.devmode.build-config @@ -24,14 +43,14 @@ - name: "quay.io/kiegroup/kogito-swf-devmode" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" - version: "2.0.0-snapshot" + version: "999-SNAPSHOT" description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled" labels: - name: "io.quarkus.platform.version" - value: "2.16.10.Final" + value: "3.2.9.Final" - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -55,10 +74,11 @@ - name: org.kie.kogito.logging - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.openjdk - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.maven - version: "3.8.6" + version: "3.9.3" + - name: org.kie.kogito.maven.common - name: org.kie.kogito.project.versions - name: org.kie.kogito.swf.common.scripts - name: org.kie.kogito.swf.devmode.runtime.common diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml index d4a0d1a0b..75bfaf15c 100644 --- a/kogito-task-console-image.yaml +++ b/kogito-task-console-image.yaml @@ -1,13 +1,31 @@ +# +# 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-task-console" -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" description: "Runtime image for Kogito Task Console" labels: - name: "org.kie.kogito.version" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" - name: "maintainer" value: "Apache KIE " - name: "io.k8s.description" @@ -38,7 +56,7 @@ modules: - name: org.kie.kogito.system.user - name: org.kie.kogito.logging - name: org.kie.kogito.openjdk.headless - version: "11" + version: "17" - name: org.kie.kogito.dynamic.resources - name: org.kie.kogito.launch.scripts - name: org.kie.kogito.task.console diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml deleted file mode 100644 index 0fcec5944..000000000 --- a/kogito-trusty-infinispan-image.yaml +++ /dev/null @@ -1,71 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-trusty-infinispan" -version: "2.0.0-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: "2.0.0-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: "11" - - 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 6f8848df6..000000000 --- a/kogito-trusty-postgresql-image.yaml +++ /dev/null @@ -1,53 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-trusty-postgresql" -version: "2.0.0-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: "2.0.0-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: "11" - - 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 eb5bfc69b..000000000 --- a/kogito-trusty-redis-image.yaml +++ /dev/null @@ -1,56 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-trusty-redis" -version: "2.0.0-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: "2.0.0-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: "11" - - 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 0386231f5..000000000 --- a/kogito-trusty-ui-image.yaml +++ /dev/null @@ -1,54 +0,0 @@ -schema_version: 1 - -name: "quay.io/kiegroup/kogito-trusty-ui" -version: "2.0.0-snapshot" -from: "registry.access.redhat.com/ubi8/ubi-minimal:latest" -description: "Runtime image for Kogito Trusty UI" - -labels: - - name: "org.kie.kogito.version" - value: "2.0.0-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: "11" - - 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 9e7bf634c..000000000 --- a/logic-data-index-ephemeral-rhel8-image.yaml +++ /dev/null @@ -1,76 +0,0 @@ -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: "2.0.0-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 46e863bb1..000000000 --- a/logic-imagestream.yaml +++ /dev/null @@ -1,71 +0,0 @@ -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 ad674d6b3..000000000 --- a/logic-swf-builder-rhel8-image.yaml +++ /dev/null @@ -1,71 +0,0 @@ -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: "2.0.0-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 88e6e4e94..000000000 --- a/logic-swf-devmode-rhel8-image.yaml +++ /dev/null @@ -1,70 +0,0 @@ -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: "2.0.0-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-custom-truststore/added/configure-custom-truststore.sh b/modules/kogito-custom-truststore/added/configure-custom-truststore.sh index ceb13d1f8..f3c180f88 100755 --- a/modules/kogito-custom-truststore/added/configure-custom-truststore.sh +++ b/modules/kogito-custom-truststore/added/configure-custom-truststore.sh @@ -1,4 +1,22 @@ #!/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 # imports diff --git a/modules/kogito-custom-truststore/configure b/modules/kogito-custom-truststore/configure index 30150e5be..ddd815e3e 100644 --- a/modules/kogito-custom-truststore/configure +++ b/modules/kogito-custom-truststore/configure @@ -1,5 +1,22 @@ #!/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. +# SCRIPT_DIR=$(dirname "${0}") # custom truststore configuration diff --git a/modules/kogito-custom-truststore/module.yaml b/modules/kogito-custom-truststore/module.yaml index da19011e0..aa895428b 100644 --- a/modules/kogito-custom-truststore/module.yaml +++ b/modules/kogito-custom-truststore/module.yaml @@ -1,6 +1,24 @@ +# +# 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.security.custom.truststores -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Adds the capability of configuring a custom Java Truststore to replace the original cacerts" envs: diff --git a/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats b/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats index 0924abaeb..0ac34266f 100644 --- a/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats +++ b/modules/kogito-custom-truststore/tests/bats/kogito-custom-truststore.bats @@ -1,4 +1,23 @@ #!/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}" diff --git a/modules/kogito-data-index-common/added/kogito-data-index-common.sh b/modules/kogito-data-index-common/added/kogito-data-index-common.sh index 99e1537f7..373ada7ef 100644 --- a/modules/kogito-data-index-common/added/kogito-data-index-common.sh +++ b/modules/kogito-data-index-common/added/kogito-data-index-common.sh @@ -1,4 +1,23 @@ #!/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. +# + source "${KOGITO_HOME}"/launch/logging.sh diff --git a/modules/kogito-data-index-common/configure b/modules/kogito-data-index-common/configure index e7a63ea16..fc3e50055 100644 --- a/modules/kogito-data-index-common/configure +++ b/modules/kogito-data-index-common/configure @@ -1,4 +1,22 @@ #!/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 SCRIPT_DIR=$(dirname "${0}") diff --git a/modules/kogito-data-index-common/module.yaml b/modules/kogito-data-index-common/module.yaml index 9a23ada04..a71ecc59e 100644 --- a/modules/kogito-data-index-common/module.yaml +++ b/modules/kogito-data-index-common/module.yaml @@ -1,6 +1,24 @@ +# +# 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.common -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Common modules for data-index persistence provider images, any addition that is common must be added in this module" envs: diff --git a/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats b/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats index 73c57f50b..312815753 100644 --- a/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats +++ b/modules/kogito-data-index-common/tests/bats/kogito-data-index-common.bats @@ -1,4 +1,23 @@ #!/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}" diff --git a/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh index c7cb1665e..aa15cda21 100644 --- a/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh +++ b/modules/kogito-data-index-ephemeral/community/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-data-index-ephemeral/community/configure b/modules/kogito-data-index-ephemeral/community/configure index 08f17a9c6..f5807a90e 100644 --- a/modules/kogito-data-index-ephemeral/community/configure +++ b/modules/kogito-data-index-ephemeral/community/configure @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-data-index-ephemeral/community/module.yaml b/modules/kogito-data-index-ephemeral/community/module.yaml index 165e87c2a..31d4e1bee 100644 --- a/modules/kogito-data-index-ephemeral/community/module.yaml +++ b/modules/kogito-data-index-ephemeral/community/module.yaml @@ -1,6 +1,24 @@ +# +# 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.community.ephemeral -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" # see build-kogito-apps-components.sh script, responsible for build it. # called by the Makefile before builds diff --git a/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh b/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh index c7cb1665e..aa15cda21 100644 --- a/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh +++ b/modules/kogito-data-index-ephemeral/prod/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-data-index-ephemeral/prod/configure b/modules/kogito-data-index-ephemeral/prod/configure index 3fbee4311..d24e68683 100644 --- a/modules/kogito-data-index-ephemeral/prod/configure +++ b/modules/kogito-data-index-ephemeral/prod/configure @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-data-index-ephemeral/prod/module.yaml b/modules/kogito-data-index-ephemeral/prod/module.yaml index 0596e56b5..f0c0a8ddc 100644 --- a/modules/kogito-data-index-ephemeral/prod/module.yaml +++ b/modules/kogito-data-index-ephemeral/prod/module.yaml @@ -1,3 +1,21 @@ +# +# 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.prod.ephemeral version: "1.30.0" 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 e82e98ae5..000000000 --- a/modules/kogito-data-index-infinispan/added/kogito-app-launch.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -#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 5e2c185fe..000000000 --- a/modules/kogito-data-index-infinispan/configure +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -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 46a69af7d..000000000 --- a/modules/kogito-data-index-infinispan/module.yaml +++ /dev/null @@ -1,13 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.dataindex.infinispan -version: "2.0.0-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 e82e98ae5..000000000 --- a/modules/kogito-data-index-mongodb/added/kogito-app-launch.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -#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 1448e355e..000000000 --- a/modules/kogito-data-index-mongodb/configure +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -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 2a818e8b6..000000000 --- a/modules/kogito-data-index-mongodb/module.yaml +++ /dev/null @@ -1,13 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.dataindex.mongodb -version: "2.0.0-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 2210fc5ce..000000000 --- a/modules/kogito-data-index-oracle/added/kogito-app-launch.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -#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 051da7b21..000000000 --- a/modules/kogito-data-index-oracle/configure +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -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 9e6821b57..000000000 --- a/modules/kogito-data-index-oracle/module.yaml +++ /dev/null @@ -1,13 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.dataindex.oracle -version: "2.0.0-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-data-index-postgresql/added/kogito-app-launch.sh b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh index e82e98ae5..ec77a2569 100644 --- a/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh +++ b/modules/kogito-data-index-postgresql/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-data-index-postgresql/configure b/modules/kogito-data-index-postgresql/configure index 54b243a83..a38b551b6 100644 --- a/modules/kogito-data-index-postgresql/configure +++ b/modules/kogito-data-index-postgresql/configure @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-data-index-postgresql/module.yaml b/modules/kogito-data-index-postgresql/module.yaml index c3be5d2e7..3ad6f1872 100644 --- a/modules/kogito-data-index-postgresql/module.yaml +++ b/modules/kogito-data-index-postgresql/module.yaml @@ -1,6 +1,24 @@ +# +# 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.postgresql -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" # see build-kogito-apps-components.sh script, responsible for build it. # called by the Makefile before builds diff --git a/modules/kogito-dynamic-resources/added/container-limits b/modules/kogito-dynamic-resources/added/container-limits index a6c359c70..316cc17a5 100644 --- a/modules/kogito-dynamic-resources/added/container-limits +++ b/modules/kogito-dynamic-resources/added/container-limits @@ -1,4 +1,22 @@ #!/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. +# # Detects container limits # If found these are exposed as the following environment variables: # diff --git a/modules/kogito-dynamic-resources/added/debug-options b/modules/kogito-dynamic-resources/added/debug-options index bbc71d2d8..b7ea7d4ed 100644 --- a/modules/kogito-dynamic-resources/added/debug-options +++ b/modules/kogito-dynamic-resources/added/debug-options @@ -1,5 +1,22 @@ #!/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. +# # Check for debug options and echo them if enabled. Meant to be included by # a run script. diff --git a/modules/kogito-dynamic-resources/added/java-default-options b/modules/kogito-dynamic-resources/added/java-default-options index 5b4c78aa0..5ec707a68 100644 --- a/modules/kogito-dynamic-resources/added/java-default-options +++ b/modules/kogito-dynamic-resources/added/java-default-options @@ -1,4 +1,22 @@ #!/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. +# # ================================================================= # Detect whether running in a container and set appropriate options # for limiting Java VM resources @@ -139,7 +157,7 @@ gc_config() { local timeRatio=${GC_TIME_RATIO:-4} local adaptiveSizePolicyWeight=${GC_ADAPTIVE_SIZE_POLICY_WEIGHT:-90} local maxMetaspaceSize - local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelOldGC}" + local gcOptions="${GC_CONTAINER_OPTIONS:--XX:+UseParallelGC}" # for compat reasons we don't set a default value for metaspaceSize local metaspaceSize diff --git a/modules/kogito-dynamic-resources/configure b/modules/kogito-dynamic-resources/configure index c9c4131f8..4a24c6e9a 100644 --- a/modules/kogito-dynamic-resources/configure +++ b/modules/kogito-dynamic-resources/configure @@ -1,4 +1,22 @@ #!/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 SCRIPT_DIR=$(dirname "$0") diff --git a/modules/kogito-dynamic-resources/module.yaml b/modules/kogito-dynamic-resources/module.yaml index a8ae2692e..55802bf98 100644 --- a/modules/kogito-dynamic-resources/module.yaml +++ b/modules/kogito-dynamic-resources/module.yaml @@ -1,6 +1,24 @@ +# +# 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.dynamic.resources -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: -| Module retrieved from https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash However it contains a few customizations to fit Kogito needs. @@ -55,5 +73,5 @@ envs: description: The maximum metaspace size. example: "100" - name: GC_CONTAINER_OPTIONS - description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelOldGC`. + description: specify Java GC to use. The value of this variable should contain the necessary JRE command-line options to specify the required GC, which will override the default of `-XX:+UseParallelGC`. example: -XX:+UseG1GC diff --git a/modules/kogito-epel/7/configure.sh b/modules/kogito-epel/7/configure.sh index 1ded449d0..ee946345f 100644 --- a/modules/kogito-epel/7/configure.sh +++ b/modules/kogito-epel/7/configure.sh @@ -1,4 +1,23 @@ #!/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 rpm -i https://download.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm diff --git a/modules/kogito-epel/7/module.yaml b/modules/kogito-epel/7/module.yaml index 8354aa9d9..3a84cf27b 100644 --- a/modules/kogito-epel/7/module.yaml +++ b/modules/kogito-epel/7/module.yaml @@ -1,3 +1,21 @@ +# +# 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.epel version: "7" 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 77505f7d7..000000000 --- a/modules/kogito-explainability/added/kogito-app-launch.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -#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 39436a468..000000000 --- a/modules/kogito-explainability/added/launch/kogito-explainability.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -#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 ec958af86..000000000 --- a/modules/kogito-explainability/configure +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -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 66ecaaed7..000000000 --- a/modules/kogito-explainability/module.yaml +++ /dev/null @@ -1,14 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.explainability -version: "2.0.0-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 edda6753d..000000000 --- a/modules/kogito-explainability/tests/bats/kogito-explainability.bats +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bats - -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-graalvm-installer/22.3-java-11/configure b/modules/kogito-graalvm-installer/22.3-java-11/configure index 5155cecc1..7ce473e71 100644 --- a/modules/kogito-graalvm-installer/22.3-java-11/configure +++ b/modules/kogito-graalvm-installer/22.3-java-11/configure @@ -1,4 +1,22 @@ #!/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 architecture=$(uname -i) diff --git a/modules/kogito-graalvm-installer/22.3-java-11/module.yaml b/modules/kogito-graalvm-installer/22.3-java-11/module.yaml index 551734f74..5a5c81a54 100644 --- a/modules/kogito-graalvm-installer/22.3-java-11/module.yaml +++ b/modules/kogito-graalvm-installer/22.3-java-11/module.yaml @@ -1,3 +1,21 @@ +# +# 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.graalvm.java11.installer version: "22.3" diff --git a/modules/kogito-graalvm-installer/23.0-java-17/configure b/modules/kogito-graalvm-installer/23.0-java-17/configure new file mode 100644 index 000000000..b88d4b063 --- /dev/null +++ b/modules/kogito-graalvm-installer/23.0-java-17/configure @@ -0,0 +1,42 @@ +#!/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 + +architecture=$(uname -i) + +if [ "$architecture" = "x86_64" ]; then + arch='amd64' +elif [ "$architecture" = "aarch64" ]; then + arch='aarch64' +else + exit 0 +fi + +SOURCES_DIR=/tmp/artifacts +SCRIPT_DIR=$(dirname "${0}") + +tar xzf "${SOURCES_DIR}"/mandrel-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}"-Final.tar.gz -C /usr/share +mv /usr/share/mandrel-java"${GRAALVM_JAVA_VERSION}"-"${GRAALVM_VERSION}-Final" /usr/share/graalvm + +#KOGITO-384 - Add libsunec.so and cacerts to Kogito runtime native image +# Java 17 + Mandrel: libsunec.so is not distributed in Mandrel +#mkdir -p "${KOGITO_HOME}"/ssl-libs +#cp -v "$GRAALVM_HOME"/lib/libsunec.so "${KOGITO_HOME}"/ssl-libs +cp -v "$GRAALVM_HOME"/lib/security/cacerts "${KOGITO_HOME}"/ diff --git a/modules/kogito-graalvm-installer/23.0-java-17/module.yaml b/modules/kogito-graalvm-installer/23.0-java-17/module.yaml new file mode 100644 index 000000000..83cee0a3d --- /dev/null +++ b/modules/kogito-graalvm-installer/23.0-java-17/module.yaml @@ -0,0 +1,51 @@ +# +# 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.graalvm.java17.installer +version: "23.0" + +envs: + - name: "JAVA_HOME" + value: "/usr/share/graalvm" + - name: "GRAALVM_HOME" + value: "/usr/share/graalvm" + - name: "GRAALVM_VERSION" + value: "23.0.2.1" + - name: "GRAALVM_JAVA_VERSION" + value: "17" + +packages: + manager: microdnf + install: + - freetype-devel + - gcc + - glibc-devel + - libstdc++-static + - zlib-devel + +artifacts: + - name: mandrel-java17-linux-amd64-23.0.2.1-Final.tar.gz + url: https://github.com/graalvm/mandrel/releases/download/mandrel-23.0.2.1-Final/mandrel-java17-linux-amd64-23.0.2.1-Final.tar.gz + md5: b026ea8d357b13702f9cd05f3d87f64a + - name: mandrel-java17-linux-aarch64-23.0.2.1-Final.tar.gz + url: https://github.com/graalvm/mandrel/releases/download/mandrel-23.0.2.1-Final/mandrel-java17-linux-aarch64-23.0.2.1-Final.tar.gz + md5: e3143fe4bb21267087cca3ca66ae6af2 + +execute: + - script: configure diff --git a/modules/kogito-graalvm-scripts/22.3-java-11/configure b/modules/kogito-graalvm-scripts/22.3-java-11/configure new file mode 100644 index 000000000..b39969f7b --- /dev/null +++ b/modules/kogito-graalvm-scripts/22.3-java-11/configure @@ -0,0 +1,35 @@ +#!/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 + +architecture=$(uname -i) +arch=${architecture} + +if [ "$architecture" = "x86_64" ]; then + arch='amd64' +elif [ "$architecture" = "aarch64" ]; then + arch='aarch64' +else + exit 0 +fi + +SOURCES_DIR=/tmp/artifacts + +/usr/share/graalvm/bin/gu -L install "${SOURCES_DIR}"/native-image-installable-svm-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}".jar diff --git a/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml b/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml new file mode 100644 index 000000000..49a2e2b38 --- /dev/null +++ b/modules/kogito-graalvm-scripts/22.3-java-11/module.yaml @@ -0,0 +1,24 @@ +# +# 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.graalvm.scripts +version: "22.3-java-11" + +execute: + - script: configure diff --git a/modules/kogito-graalvm-scripts/added/memory-limit.sh b/modules/kogito-graalvm-scripts/common/added/memory-limit.sh similarity index 72% rename from modules/kogito-graalvm-scripts/added/memory-limit.sh rename to modules/kogito-graalvm-scripts/common/added/memory-limit.sh index 5fbc5cd98..7b5e53bc6 100644 --- a/modules/kogito-graalvm-scripts/added/memory-limit.sh +++ b/modules/kogito-graalvm-scripts/common/added/memory-limit.sh @@ -1,4 +1,23 @@ #!/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. +# + # # Limit memory usage for Graal VM native builds # for more info access https://issues.jboss.org/browse/KOGITO-306 diff --git a/modules/kogito-graalvm-scripts/common/configure b/modules/kogito-graalvm-scripts/common/configure new file mode 100644 index 000000000..8d0a9cae0 --- /dev/null +++ b/modules/kogito-graalvm-scripts/common/configure @@ -0,0 +1,24 @@ +#!/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 + +SCRIPT_DIR=$(dirname "${0}") + +cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/ diff --git a/modules/kogito-graalvm-scripts/common/module.yaml b/modules/kogito-graalvm-scripts/common/module.yaml new file mode 100644 index 000000000..a9ec2e0a0 --- /dev/null +++ b/modules/kogito-graalvm-scripts/common/module.yaml @@ -0,0 +1,24 @@ +# +# 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.graalvm.common.scripts +version: "999-SNAPSHOT" + +execute: + - script: configure diff --git a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats b/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats similarity index 62% rename from modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats rename to modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats index f500322d9..703711580 100644 --- a/modules/kogito-graalvm-scripts/tests/bats/memory-limits.bats +++ b/modules/kogito-graalvm-scripts/common/tests/bats/memory-limits.bats @@ -1,10 +1,29 @@ #!/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 JBOSS_CONTAINER_JAVA_JVM_MODULE=${KOGITO_HOME}/launch mkdir -p "${KOGITO_HOME}"/launch -cp $BATS_TEST_DIRNAME/../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/ -cp $BATS_TEST_DIRNAME/../../../kogito-dynamic-resources/added/container-limits "${KOGITO_HOME}"/launch/ +cp $BATS_TEST_DIRNAME/../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/ +cp $BATS_TEST_DIRNAME/../../../../kogito-dynamic-resources/added/container-limits "${KOGITO_HOME}"/launch/ # imports source $BATS_TEST_DIRNAME/../../added/memory-limit.sh diff --git a/modules/kogito-graalvm-scripts/configure b/modules/kogito-graalvm-scripts/configure deleted file mode 100644 index 025dea6b9..000000000 --- a/modules/kogito-graalvm-scripts/configure +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -set -e - -architecture=$(uname -i) -arch=${architecture} - -if [ "$architecture" = "x86_64" ]; then - arch='amd64' -elif [ "$architecture" = "aarch64" ]; then - arch='aarch64' -else - exit 0 -fi - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") - -cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/ - -/usr/share/graalvm/bin/gu -L install "${SOURCES_DIR}"/native-image-installable-svm-java"${GRAALVM_JAVA_VERSION}"-linux-${arch}-"${GRAALVM_VERSION}".jar diff --git a/modules/kogito-graalvm-scripts/module.yaml b/modules/kogito-graalvm-scripts/module.yaml deleted file mode 100644 index b29ae4316..000000000 --- a/modules/kogito-graalvm-scripts/module.yaml +++ /dev/null @@ -1,6 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.graalvm.scripts -version: "2.0.0-snapshot" - -execute: - - script: configure diff --git a/modules/kogito-image-dependencies/clean.sh b/modules/kogito-image-dependencies/clean.sh index d99eb4fb1..5b184d1a0 100644 --- a/modules/kogito-image-dependencies/clean.sh +++ b/modules/kogito-image-dependencies/clean.sh @@ -1,4 +1,22 @@ #!/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. +# microdnf clean all rm -rf /var/cache/yum \ No newline at end of file diff --git a/modules/kogito-image-dependencies/module.yaml b/modules/kogito-image-dependencies/module.yaml index ce03a19fd..bae10fce5 100644 --- a/modules/kogito-image-dependencies/module.yaml +++ b/modules/kogito-image-dependencies/module.yaml @@ -1,6 +1,24 @@ +# +# 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.image.dependencies -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: holds common dependencies across images execute: diff --git a/modules/kogito-jit-runner/added/kogito-app-launch.sh b/modules/kogito-jit-runner/added/kogito-app-launch.sh index e4b381a1e..f519f07d4 100644 --- a/modules/kogito-jit-runner/added/kogito-app-launch.sh +++ b/modules/kogito-jit-runner/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-jit-runner/configure b/modules/kogito-jit-runner/configure index 0e635d596..871632d9a 100644 --- a/modules/kogito-jit-runner/configure +++ b/modules/kogito-jit-runner/configure @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-jit-runner/module.yaml b/modules/kogito-jit-runner/module.yaml index eb2cbb4b0..75fee11a7 100644 --- a/modules/kogito-jit-runner/module.yaml +++ b/modules/kogito-jit-runner/module.yaml @@ -1,6 +1,24 @@ +# +# 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.jit-runner -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" # see build-kogito-apps-components.sh script, responsible for build it. # called by the Makefile before builds diff --git a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh index 655a58a5d..43fc15e1c 100644 --- a/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh +++ b/modules/kogito-jobs-service-all-in-one/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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 @@ -11,7 +30,7 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then printenv fi -allowed_jobs_service_flavors=("ephemeral" "mongodb" "infinispan" "postgresql") +allowed_jobs_service_flavors=("ephemeral" "postgresql") jobs_service_flavor="ephemeral" if [[ ! "${allowed_jobs_service_flavors[*]}" =~ ${JOBS_SERVICE_PERSISTENCE,,} ]]; then log_warning "${JOBS_SERVICE_PERSISTENCE,,} is not supported, the allowed flavors are [${allowed_jobs_service_flavors[*]}], defaulting to ${jobs_service_flavor}" diff --git a/modules/kogito-jobs-service-all-in-one/configure b/modules/kogito-jobs-service-all-in-one/configure index eac87292d..6777f4806 100644 --- a/modules/kogito-jobs-service-all-in-one/configure +++ b/modules/kogito-jobs-service-all-in-one/configure @@ -1,4 +1,22 @@ #!/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 @@ -6,8 +24,6 @@ SCRIPT_DIR=$(dirname "${0}") ADDED_DIR="${SCRIPT_DIR}"/added unzip "${SOURCES_DIR}"/jobs-service-inmemory-quarkus-app.zip -d "${KOGITO_HOME}"/bin/ephemeral -unzip "${SOURCES_DIR}"/jobs-service-infinispan-quarkus-app.zip -d "${KOGITO_HOME}"/bin/infinispan -unzip "${SOURCES_DIR}"/jobs-service-mongodb-quarkus-app.zip -d "${KOGITO_HOME}"/bin/mongodb unzip "${SOURCES_DIR}"/jobs-service-postgresql-quarkus-app.zip -d "${KOGITO_HOME}"/bin/postgresql @@ -17,14 +33,6 @@ mv "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared- rm -rf "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/ephemeral/quarkus-app/lib -cp -r "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/ -rm -rf "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib -ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/infinispan/quarkus-app/lib - -cp -r "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/ -rm -rf "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib -ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/mongodb/quarkus-app/lib - cp -r "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib/* "${KOGITO_HOME}"/bin/shared-libs/ rm -rf "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib ln -s "${KOGITO_HOME}"/bin/shared-libs "${KOGITO_HOME}"/bin/postgresql/quarkus-app/lib diff --git a/modules/kogito-jobs-service-all-in-one/module.yaml b/modules/kogito-jobs-service-all-in-one/module.yaml index 56bdb2896..aa890d326 100644 --- a/modules/kogito-jobs-service-all-in-one/module.yaml +++ b/modules/kogito-jobs-service-all-in-one/module.yaml @@ -1,14 +1,28 @@ +# +# 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.allinone -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" artifacts: - path: /tmp/build/jobs-service-inmemory-all-in-one/jobs-service-inmemory-quarkus-app.zip name: jobs-service-inmemory-quarkus-app.zip - - path: /tmp/build/jobs-service-mongodb-all-in-one/jobs-service-mongodb-quarkus-app.zip - name: jobs-service-mongodb-quarkus-app.zip - - path: /tmp/build/jobs-service-infinispan-all-in-one/jobs-service-infinispan-quarkus-app.zip - name: jobs-service-infinispan-quarkus-app.zip - path: /tmp/build/jobs-service-postgresql-all-in-one/jobs-service-postgresql-quarkus-app.zip name: jobs-service-postgresql-quarkus-app.zip diff --git a/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh b/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh index 589ed1fa3..b5c8c6131 100644 --- a/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh +++ b/modules/kogito-jobs-service-common/added/launch/kogito-jobs-service-common.sh @@ -1,4 +1,23 @@ #!/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. +# + source "${KOGITO_HOME}"/launch/logging.sh diff --git a/modules/kogito-jobs-service-common/configure b/modules/kogito-jobs-service-common/configure index 033b6cb99..4f07301d7 100644 --- a/modules/kogito-jobs-service-common/configure +++ b/modules/kogito-jobs-service-common/configure @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-jobs-service-common/module.yaml b/modules/kogito-jobs-service-common/module.yaml index c423842db..83ad300e8 100644 --- a/modules/kogito-jobs-service-common/module.yaml +++ b/modules/kogito-jobs-service-common/module.yaml @@ -1,6 +1,24 @@ +# +# 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.common -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "This module needs to be run last, if adding it, add in the last position." execute: diff --git a/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats b/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats index 66b86ba1a..f6ab9514e 100644 --- a/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats +++ b/modules/kogito-jobs-service-common/tests/bats/kogito-jobs-service-common.bats @@ -1,4 +1,23 @@ #!/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}" diff --git a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh index 75d6ec882..66b2da357 100644 --- a/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh +++ b/modules/kogito-jobs-service-ephemeral/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-jobs-service-ephemeral/configure b/modules/kogito-jobs-service-ephemeral/configure index e0d10a796..c9a470c1b 100644 --- a/modules/kogito-jobs-service-ephemeral/configure +++ b/modules/kogito-jobs-service-ephemeral/configure @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-jobs-service-ephemeral/module.yaml b/modules/kogito-jobs-service-ephemeral/module.yaml index cb817ae3a..685f27e2a 100644 --- a/modules/kogito-jobs-service-ephemeral/module.yaml +++ b/modules/kogito-jobs-service-ephemeral/module.yaml @@ -1,6 +1,24 @@ +# +# 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.ephemeral -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" # see build-kogito-apps-components.sh script, responsible for build it. # called by the Makefile before builds 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 d29918962..000000000 --- a/modules/kogito-jobs-service-infinispan/added/kogito-app-launch.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -#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 da71b7c33..000000000 --- a/modules/kogito-jobs-service-infinispan/configure +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -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 23b096190..000000000 --- a/modules/kogito-jobs-service-infinispan/module.yaml +++ /dev/null @@ -1,13 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.jobs.service.infinispan -version: "2.0.0-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 b46d90c17..000000000 --- a/modules/kogito-jobs-service-mongodb/added/kogito-app-launch.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env bash - -#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 8ecd954a5..000000000 --- a/modules/kogito-jobs-service-mongodb/configure +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -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 e3402a6aa..000000000 --- a/modules/kogito-jobs-service-mongodb/module.yaml +++ /dev/null @@ -1,12 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.jobs.service.mongodb -version: "2.0.0-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-jobs-service-postgresql/added/kogito-app-launch.sh b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh index 35aa6253e..4ee5b43d6 100644 --- a/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh +++ b/modules/kogito-jobs-service-postgresql/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-jobs-service-postgresql/configure b/modules/kogito-jobs-service-postgresql/configure index 314d7c6e8..5ecde9755 100644 --- a/modules/kogito-jobs-service-postgresql/configure +++ b/modules/kogito-jobs-service-postgresql/configure @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-jobs-service-postgresql/module.yaml b/modules/kogito-jobs-service-postgresql/module.yaml index 673126693..67c5b13d0 100644 --- a/modules/kogito-jobs-service-postgresql/module.yaml +++ b/modules/kogito-jobs-service-postgresql/module.yaml @@ -1,6 +1,24 @@ +# +# 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.postgresql -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" # see build-kogito-apps-components.sh script, responsible for build it. # called by the Makefile before builds diff --git a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh index 6ff9c801f..ad347c762 100644 --- a/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh +++ b/modules/kogito-kubernetes-client/added/kogito-kubernetes-client.sh @@ -1,4 +1,23 @@ #!/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. +# + # imports source "${KOGITO_HOME}"/launch/logging.sh diff --git a/modules/kogito-kubernetes-client/configure b/modules/kogito-kubernetes-client/configure index 9a5ee7ceb..edee947fd 100644 --- a/modules/kogito-kubernetes-client/configure +++ b/modules/kogito-kubernetes-client/configure @@ -1,5 +1,22 @@ #!/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. +# SCRIPT_DIR=$(dirname "${0}") # kogito-kubernetes-client diff --git a/modules/kogito-kubernetes-client/module.yaml b/modules/kogito-kubernetes-client/module.yaml index 2a4de0e6c..0b69f553a 100644 --- a/modules/kogito-kubernetes-client/module.yaml +++ b/modules/kogito-kubernetes-client/module.yaml @@ -1,6 +1,24 @@ +# +# 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.kubernetes.client -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" execute: - script: configure diff --git a/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats b/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats index 10876f6cf..6f4df27e1 100644 --- a/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats +++ b/modules/kogito-kubernetes-client/tests/bats/kogito-kubernetes-client.bats @@ -1,4 +1,23 @@ #!/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=$BATS_TMPDIR/kogito_home mkdir -p "${KOGITO_HOME}"/launch diff --git a/modules/kogito-launch-scripts/added/configure.sh b/modules/kogito-launch-scripts/added/configure.sh index 1e2408830..638e9bbcf 100644 --- a/modules/kogito-launch-scripts/added/configure.sh +++ b/modules/kogito-launch-scripts/added/configure.sh @@ -1,4 +1,23 @@ #!/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. +# + # This script executes a list of modules defined by CONFIGURE_SCRIPTS. # # Configuration occurs over three basic phases: preConfigure, configure and diff --git a/modules/kogito-launch-scripts/configure b/modules/kogito-launch-scripts/configure index 96e16a503..096018fd5 100644 --- a/modules/kogito-launch-scripts/configure +++ b/modules/kogito-launch-scripts/configure @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-launch-scripts/module.yaml b/modules/kogito-launch-scripts/module.yaml index 9d9c9802c..f1f932236 100644 --- a/modules/kogito-launch-scripts/module.yaml +++ b/modules/kogito-launch-scripts/module.yaml @@ -1,6 +1,24 @@ +# +# 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.launch.scripts -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" execute: - script: configure diff --git a/modules/kogito-logging/added/logging.sh b/modules/kogito-logging/added/logging.sh index 7d4359550..9c72c21ed 100644 --- a/modules/kogito-logging/added/logging.sh +++ b/modules/kogito-logging/added/logging.sh @@ -1,4 +1,23 @@ #!/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. +# + BLACK='\033[0;30m' RED='\033[0;31m' diff --git a/modules/kogito-logging/configure b/modules/kogito-logging/configure index 620777ae5..f16737b46 100644 --- a/modules/kogito-logging/configure +++ b/modules/kogito-logging/configure @@ -1,5 +1,22 @@ #!/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. +# SCRIPT_DIR=$(dirname "${0}") # logging diff --git a/modules/kogito-logging/module.yaml b/modules/kogito-logging/module.yaml index d8f6defdd..119f26c80 100644 --- a/modules/kogito-logging/module.yaml +++ b/modules/kogito-logging/module.yaml @@ -1,6 +1,24 @@ +# +# 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.logging -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" execute: - script: configure diff --git a/modules/kogito-management-console/added/kogito-app-launch.sh b/modules/kogito-management-console/added/kogito-app-launch.sh index e0a80090d..e5d0f05fd 100644 --- a/modules/kogito-management-console/added/kogito-app-launch.sh +++ b/modules/kogito-management-console/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-management-console/added/launch/kogito-management-console.sh b/modules/kogito-management-console/added/launch/kogito-management-console.sh index d8b68ce3c..e0f964139 100644 --- a/modules/kogito-management-console/added/launch/kogito-management-console.sh +++ b/modules/kogito-management-console/added/launch/kogito-management-console.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-management-console/configure.sh b/modules/kogito-management-console/configure.sh index e370070e0..a7d9cab33 100644 --- a/modules/kogito-management-console/configure.sh +++ b/modules/kogito-management-console/configure.sh @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-management-console/module.yaml b/modules/kogito-management-console/module.yaml index 941d55a3a..063487f45 100644 --- a/modules/kogito-management-console/module.yaml +++ b/modules/kogito-management-console/module.yaml @@ -1,6 +1,24 @@ +# +# 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.management.console -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" # see build-kogito-apps-components.sh script, responsible for build it. # called by the Makefile before builds diff --git a/modules/kogito-management-console/tests/bats/kogito-management-console.bats b/modules/kogito-management-console/tests/bats/kogito-management-console.bats index cd7e2b033..ee8c95f20 100644 --- a/modules/kogito-management-console/tests/bats/kogito-management-console.bats +++ b/modules/kogito-management-console/tests/bats/kogito-management-console.bats @@ -1,4 +1,23 @@ #!/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}" 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 4fbf01fae..000000000 --- a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh +++ /dev/null @@ -1,253 +0,0 @@ -#!/usr/bin/env bash - -#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 12edfbf4c..000000000 --- a/modules/kogito-maven/3.8.x-rpm/configure +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh -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/configure b/modules/kogito-maven/3.8.x/configure deleted file mode 100644 index 196423d3a..000000000 --- a/modules/kogito-maven/3.8.x/configure +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - -SOURCES_DIR=/tmp/artifacts -SCRIPT_DIR=$(dirname "${0}") - -tar xzf "${SOURCES_DIR}"/apache-maven-"${MAVEN_VERSION}"-bin.tar.gz -C /usr/share -mv /usr/share/apache-maven-"${MAVEN_VERSION}" /usr/share/maven - -mkdir "${KOGITO_HOME}"/.m2 -cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2 -cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/ diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml index 147d1b652..2749d798b 100644 --- a/modules/kogito-maven/3.8.x/module.yaml +++ b/modules/kogito-maven/3.8.x/module.yaml @@ -1,3 +1,21 @@ +# +# 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 version: "3.8.6" @@ -5,77 +23,10 @@ version: "3.8.6" envs: - name: "MAVEN_VERSION" value: "3.8.6" - - 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" + # unfortunately by now the version needs to be hardcoded. artifacts: - name: apache-maven-3.8.6-bin.tar.gz url: https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz md5: 0e07de4a7b5c84ebed737a2002f52019 -execute: - - script: configure diff --git a/modules/kogito-maven/3.9.x/module.yaml b/modules/kogito-maven/3.9.x/module.yaml new file mode 100644 index 000000000..dcd4b8a67 --- /dev/null +++ b/modules/kogito-maven/3.9.x/module.yaml @@ -0,0 +1,32 @@ +# +# 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 +version: "3.9.3" + +envs: + - name: "MAVEN_VERSION" + value: "3.9.3" + +# unfortunately by now the version needs to be hardcoded. +artifacts: + - name: apache-maven-3.9.3-bin.tar.gz + url: https://archive.apache.org/dist/maven/maven-3/3.9.3/binaries/apache-maven-3.9.3-bin.tar.gz + md5: f3fbff830d9a0dc2c6c99a76e27d0c01 + diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/common/added/configure-maven.sh similarity index 92% rename from modules/kogito-maven/3.8.x/added/configure-maven.sh rename to modules/kogito-maven/common/added/configure-maven.sh index 0027aa01f..b2b41b7cb 100644 --- a/modules/kogito-maven/3.8.x/added/configure-maven.sh +++ b/modules/kogito-maven/common/added/configure-maven.sh @@ -1,4 +1,23 @@ #!/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() { diff --git a/modules/kogito-maven/common/configure b/modules/kogito-maven/common/configure new file mode 100644 index 000000000..aa7e67b61 --- /dev/null +++ b/modules/kogito-maven/common/configure @@ -0,0 +1,30 @@ +#!/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}") + +tar xzf "${SOURCES_DIR}"/apache-maven-"${MAVEN_VERSION}"-bin.tar.gz -C /usr/share +mv /usr/share/apache-maven-"${MAVEN_VERSION}" /usr/share/maven + +mkdir "${KOGITO_HOME}"/.m2 +cp -v "${SCRIPT_DIR}"/maven/* "${KOGITO_HOME}"/.m2 +cp -v "${SCRIPT_DIR}"/added/* "${KOGITO_HOME}"/launch/ diff --git a/modules/kogito-maven/3.8.x/maven/settings.xml b/modules/kogito-maven/common/maven/settings.xml similarity index 100% rename from modules/kogito-maven/3.8.x/maven/settings.xml rename to modules/kogito-maven/common/maven/settings.xml diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/common/module.yaml similarity index 78% rename from modules/kogito-maven/3.8.x-rpm/module.yaml rename to modules/kogito-maven/common/module.yaml index 479479419..0c28db9b2 100644 --- a/modules/kogito-maven/3.8.x-rpm/module.yaml +++ b/modules/kogito-maven/common/module.yaml @@ -1,10 +1,28 @@ +# +# 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" +name: org.kie.kogito.maven.common +version: "999-SNAPSHOT" envs: - name: "MAVEN_VERSION" - value: "3.8" + description: "The Maven version to setup with this module" - name: "MAVEN_HOME" value: "/usr/share/maven" - name: "MAVEN_SETTINGS_PATH" @@ -34,7 +52,7 @@ envs: example: "true" - name: "DEFAULT_MAVEN_REPO_URL" value: "https://repository.apache.org/content/groups/public/" - description: "Defines the Default Maven repository for Kogito artifacts." + 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" @@ -72,14 +90,5 @@ envs: 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-maven/maven-dnf-module/configure b/modules/kogito-maven/maven-dnf-module/configure index 3b0c90a3e..fd40c2e4c 100644 --- a/modules/kogito-maven/maven-dnf-module/configure +++ b/modules/kogito-maven/maven-dnf-module/configure @@ -1,4 +1,22 @@ #!/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 SCRIPT_DIR=$(dirname $0) diff --git a/modules/kogito-maven/maven-dnf-module/module.yaml b/modules/kogito-maven/maven-dnf-module/module.yaml index e3fde534b..13daf59a2 100644 --- a/modules/kogito-maven/maven-dnf-module/module.yaml +++ b/modules/kogito-maven/maven-dnf-module/module.yaml @@ -1,3 +1,21 @@ +# +# 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.dnf.module version: "3.8" diff --git a/modules/kogito-maven/tests/bats/maven-settings.bats b/modules/kogito-maven/tests/bats/maven-settings.bats index f1dcec0ab..8a7e85067 100644 --- a/modules/kogito-maven/tests/bats/maven-settings.bats +++ b/modules/kogito-maven/tests/bats/maven-settings.bats @@ -1,13 +1,32 @@ #!/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. +# + # imports -source $BATS_TEST_DIRNAME/../../3.8.x/added/configure-maven.sh +source $BATS_TEST_DIRNAME/../../common/added/configure-maven.sh setup() { export HOME=$BATS_TMPDIR/maven mkdir -p ${HOME}/.m2/ - cp $BATS_TEST_DIRNAME/../../3.8.x/maven/settings.xml ${HOME}/.m2/ + cp $BATS_TEST_DIRNAME/../../common/maven/settings.xml ${HOME}/.m2/ export MAVEN_SETTINGS_PATH="${HOME}/.m2/settings.xml" } diff --git a/modules/kogito-openjdk/11-headless/clean.sh b/modules/kogito-openjdk/11-headless/clean.sh index d99eb4fb1..5b184d1a0 100644 --- a/modules/kogito-openjdk/11-headless/clean.sh +++ b/modules/kogito-openjdk/11-headless/clean.sh @@ -1,4 +1,22 @@ #!/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. +# microdnf clean all rm -rf /var/cache/yum \ No newline at end of file diff --git a/modules/kogito-openjdk/11-headless/module.yaml b/modules/kogito-openjdk/11-headless/module.yaml index aacfc7fd2..bf78ddea6 100644 --- a/modules/kogito-openjdk/11-headless/module.yaml +++ b/modules/kogito-openjdk/11-headless/module.yaml @@ -1,3 +1,21 @@ +# +# 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.openjdk.headless version: "11" diff --git a/modules/kogito-openjdk/11/clean.sh b/modules/kogito-openjdk/11/clean.sh index d99eb4fb1..5b184d1a0 100644 --- a/modules/kogito-openjdk/11/clean.sh +++ b/modules/kogito-openjdk/11/clean.sh @@ -1,4 +1,22 @@ #!/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. +# microdnf clean all rm -rf /var/cache/yum \ No newline at end of file diff --git a/modules/kogito-openjdk/11/module.yaml b/modules/kogito-openjdk/11/module.yaml index a6d65ea9a..c0f8e74eb 100644 --- a/modules/kogito-openjdk/11/module.yaml +++ b/modules/kogito-openjdk/11/module.yaml @@ -1,3 +1,21 @@ +# +# 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.openjdk version: "11" diff --git a/modules/kogito-openjdk/17-headless/clean.sh b/modules/kogito-openjdk/17-headless/clean.sh new file mode 100644 index 000000000..5b184d1a0 --- /dev/null +++ b/modules/kogito-openjdk/17-headless/clean.sh @@ -0,0 +1,22 @@ +#!/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. +# + +microdnf clean all +rm -rf /var/cache/yum \ No newline at end of file diff --git a/modules/kogito-openjdk/17-headless/module.yaml b/modules/kogito-openjdk/17-headless/module.yaml new file mode 100644 index 000000000..ebdf54bd5 --- /dev/null +++ b/modules/kogito-openjdk/17-headless/module.yaml @@ -0,0 +1,44 @@ +# +# 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.openjdk.headless +version: "17" + +labels: + - name: "org.jboss.product" + value: "openjdk" + - name: "org.jboss.product.version" + value: "17" + - name: "org.jboss.product.openjdk.version" + value: "17" + +envs: + - name: "JAVA_HOME" + value: "/usr/lib/jvm/java-17" + - name: "JAVA_VENDOR" + value: "openjdk" + - name: "JAVA_VERSION" + value: "17" + +execute: + - script: clean.sh + +packages: + install: + - java-17-openjdk-headless diff --git a/modules/kogito-openjdk/17/clean.sh b/modules/kogito-openjdk/17/clean.sh new file mode 100644 index 000000000..f4c79eb5c --- /dev/null +++ b/modules/kogito-openjdk/17/clean.sh @@ -0,0 +1,21 @@ +#!/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. +# +microdnf clean all +rm -rf /var/cache/yum \ No newline at end of file diff --git a/modules/kogito-openjdk/17/module.yaml b/modules/kogito-openjdk/17/module.yaml new file mode 100644 index 000000000..7a7e7349d --- /dev/null +++ b/modules/kogito-openjdk/17/module.yaml @@ -0,0 +1,44 @@ +# +# 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.openjdk +version: "17" + +labels: + - name: "org.jboss.product" + value: "openjdk" + - name: "org.jboss.product.version" + value: "17" + - name: "org.jboss.product.openjdk.version" + value: "17" + +envs: + - name: "JAVA_HOME" + value: "/usr/lib/jvm/java-17" + - name: "JAVA_VENDOR" + value: "openjdk" + - name: "JAVA_VERSION" + value: "17" + +execute: + - script: clean.sh + +packages: + install: + - java-17-openjdk-devel diff --git a/modules/kogito-persistence/added/kogito-persistence.sh b/modules/kogito-persistence/added/kogito-persistence.sh index a325e616f..a9cea6665 100644 --- a/modules/kogito-persistence/added/kogito-persistence.sh +++ b/modules/kogito-persistence/added/kogito-persistence.sh @@ -1,4 +1,23 @@ #!/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. +# + # imports source "${KOGITO_HOME}"/launch/kogito-kubernetes-client.sh diff --git a/modules/kogito-persistence/configure b/modules/kogito-persistence/configure index af1878359..1ecd7ef1d 100644 --- a/modules/kogito-persistence/configure +++ b/modules/kogito-persistence/configure @@ -1,5 +1,22 @@ #!/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. +# SCRIPT_DIR=$(dirname "${0}") # kogito-persistence diff --git a/modules/kogito-persistence/module.yaml b/modules/kogito-persistence/module.yaml index fd4705bef..c65cb8f2b 100644 --- a/modules/kogito-persistence/module.yaml +++ b/modules/kogito-persistence/module.yaml @@ -1,6 +1,24 @@ +# +# 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.persistence -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" modules: install: diff --git a/modules/kogito-persistence/tests/bats/kogito-persistence.bats b/modules/kogito-persistence/tests/bats/kogito-persistence.bats index 401d362f1..fdb026348 100644 --- a/modules/kogito-persistence/tests/bats/kogito-persistence.bats +++ b/modules/kogito-persistence/tests/bats/kogito-persistence.bats @@ -1,4 +1,23 @@ #!/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=$BATS_TMPDIR/kogito_home export MOCK_RESPONSE="" diff --git a/modules/kogito-pkg-update/configure b/modules/kogito-pkg-update/configure index ef7ae411c..82dc65a5d 100644 --- a/modules/kogito-pkg-update/configure +++ b/modules/kogito-pkg-update/configure @@ -1,4 +1,22 @@ #!/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 -euo pipefail for candidate in yum dnf microdnf; do diff --git a/modules/kogito-pkg-update/module.yaml b/modules/kogito-pkg-update/module.yaml index 48d86464e..f62beedc9 100644 --- a/modules/kogito-pkg-update/module.yaml +++ b/modules/kogito-pkg-update/module.yaml @@ -1,6 +1,24 @@ +# +# 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.pkg-update -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Perform a system update via the package manager." execute: diff --git a/modules/kogito-project-versions/module.yaml b/modules/kogito-project-versions/module.yaml index 6face3dd5..b9031b3da 100644 --- a/modules/kogito-project-versions/module.yaml +++ b/modules/kogito-project-versions/module.yaml @@ -1,12 +1,30 @@ +# +# 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.project.versions -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Kogito Project versions information" envs: - name: "KOGITO_VERSION" - value: "2.0.0-SNAPSHOT" + value: "999-SNAPSHOT" description: Defines the Kogito version to be used by the builder images. Not intended to be changed by end user. - name: "QUARKUS_PLATFORM_VERSION" - value: "2.16.10.Final" + value: "3.2.9.Final" description: Defines the Quarkus Platform version to be used by the builder images. Not intended to be changed by end user. diff --git a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh index 0b089518e..0a2b12647 100644 --- a/modules/kogito-runtime-jvm/added/kogito-app-launch.sh +++ b/modules/kogito-runtime-jvm/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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. +# + # # S2I run script for the 'kogito-runtime-jvm' images. # The run script executes the server that runs your application. diff --git a/modules/kogito-runtime-jvm/configure b/modules/kogito-runtime-jvm/configure index 79a6447b8..6635e0e76 100644 --- a/modules/kogito-runtime-jvm/configure +++ b/modules/kogito-runtime-jvm/configure @@ -1,5 +1,22 @@ #!/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. +# SCRIPT_DIR=$(dirname "${0}") ADDED_DIR="${SCRIPT_DIR}"/added diff --git a/modules/kogito-runtime-jvm/module.yaml b/modules/kogito-runtime-jvm/module.yaml index c639277d2..23b538245 100644 --- a/modules/kogito-runtime-jvm/module.yaml +++ b/modules/kogito-runtime-jvm/module.yaml @@ -1,6 +1,24 @@ +# +# 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.runtime.jvm -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" execute: - script: configure diff --git a/modules/kogito-runtime-jvm/s2i/bin/assemble b/modules/kogito-runtime-jvm/s2i/bin/assemble index 1a2513dea..390579ce5 100755 --- a/modules/kogito-runtime-jvm/s2i/bin/assemble +++ b/modules/kogito-runtime-jvm/s2i/bin/assemble @@ -1,4 +1,22 @@ #!/bin/bash -e +# +# 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. +# # this script is used by OpenShift with chained builds # to transfer data from builder image into the runtime image diff --git a/modules/kogito-runtime-jvm/s2i/bin/usage b/modules/kogito-runtime-jvm/s2i/bin/usage index fe19a008b..7a5201d0a 100644 --- a/modules/kogito-runtime-jvm/s2i/bin/usage +++ b/modules/kogito-runtime-jvm/s2i/bin/usage @@ -1,5 +1,22 @@ #!/bin/bash -e - +# +# 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. +# IMAGE_NAME="quay.io/kiegroup/kogito-runtime-jvm" if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then IMAGE_NAME="registry.redhat.io/rhpam-7/rhpam-kogito-runtime-jvm-rhel8" diff --git a/modules/kogito-runtime-native/added/kogito-app-launch.sh b/modules/kogito-runtime-native/added/kogito-app-launch.sh index be0dee0fc..234ea8820 100644 --- a/modules/kogito-runtime-native/added/kogito-app-launch.sh +++ b/modules/kogito-runtime-native/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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. +# + # # S2I run script for the 'kogito-runtime-native' images. # The run script executes the server that runs your application. @@ -22,5 +41,5 @@ source "${KOGITO_HOME}"/launch/configure.sh # shellcheck disable=SC2086 exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_NATIVE_PROPS} \ - -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \ + -Dquarkus.http.host=0.0.0.0 \ -Dquarkus.http.port=8080 diff --git a/modules/kogito-runtime-native/configure b/modules/kogito-runtime-native/configure index 79a6447b8..6635e0e76 100644 --- a/modules/kogito-runtime-native/configure +++ b/modules/kogito-runtime-native/configure @@ -1,5 +1,22 @@ #!/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. +# SCRIPT_DIR=$(dirname "${0}") ADDED_DIR="${SCRIPT_DIR}"/added diff --git a/modules/kogito-runtime-native/module.yaml b/modules/kogito-runtime-native/module.yaml index edac72546..c9dadd2d1 100644 --- a/modules/kogito-runtime-native/module.yaml +++ b/modules/kogito-runtime-native/module.yaml @@ -1,6 +1,24 @@ +# +# 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.runtime.native -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" execute: - script: configure diff --git a/modules/kogito-runtime-native/s2i/bin/assemble b/modules/kogito-runtime-native/s2i/bin/assemble index 1a2513dea..390579ce5 100755 --- a/modules/kogito-runtime-native/s2i/bin/assemble +++ b/modules/kogito-runtime-native/s2i/bin/assemble @@ -1,4 +1,22 @@ #!/bin/bash -e +# +# 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. +# # this script is used by OpenShift with chained builds # to transfer data from builder image into the runtime image diff --git a/modules/kogito-runtime-native/s2i/bin/usage b/modules/kogito-runtime-native/s2i/bin/usage index d14e5c523..1366d83c9 100644 --- a/modules/kogito-runtime-native/s2i/bin/usage +++ b/modules/kogito-runtime-native/s2i/bin/usage @@ -1,4 +1,22 @@ #!/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. +# IMAGE_NAME="quay.io/kiegroup/kogito-runtime-native" if [[ "${JBOSS_IMAGE_NAME}" =~ "rhpam-7" ]]; then diff --git a/modules/kogito-s2i-builder/added/kogito-app-launch.sh b/modules/kogito-s2i-builder/added/kogito-app-launch.sh index 71a1766e8..77ec66bf8 100644 --- a/modules/kogito-s2i-builder/added/kogito-app-launch.sh +++ b/modules/kogito-s2i-builder/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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. +# + # # S2I run script for the 'kogito-s2i-builder' image. # The run script executes the server that runs your application. @@ -36,7 +55,7 @@ case ${runtime_type} in fi # shellcheck disable=SC2086 exec "${KOGITO_HOME}"/bin/*-runner ${JAVA_OPTIONS} ${KOGITO_QUARKUS_S2I_PROPS} \ - -Dquarkus.http.host=0.0.0.0 -Djava.library.path="${KOGITO_HOME}"/ssl-libs \ + -Dquarkus.http.host=0.0.0.0 \ -Dquarkus.http.port=8080 \ -Djavax.net.ssl.trustStore="${KOGITO_HOME}"/cacerts else diff --git a/modules/kogito-s2i-builder/configure b/modules/kogito-s2i-builder/configure index 480c0383e..ebfe5a14b 100644 --- a/modules/kogito-s2i-builder/configure +++ b/modules/kogito-s2i-builder/configure @@ -1,4 +1,22 @@ #!/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. +# set -e diff --git a/modules/kogito-s2i-builder/module.yaml b/modules/kogito-s2i-builder/module.yaml index e5f1ca100..772cc9956 100644 --- a/modules/kogito-s2i-builder/module.yaml +++ b/modules/kogito-s2i-builder/module.yaml @@ -1,6 +1,24 @@ +# +# 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.s2i.builder -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" labels: - name: "io.openshift.s2i.scripts-url" diff --git a/modules/kogito-s2i-builder/s2i/bin/assemble b/modules/kogito-s2i-builder/s2i/bin/assemble index 488029f17..be0aeec0d 100644 --- a/modules/kogito-s2i-builder/s2i/bin/assemble +++ b/modules/kogito-s2i-builder/s2i/bin/assemble @@ -1,5 +1,23 @@ #!/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. +# +# # S2I assemble script for the 'kogito-builder' image. # The 'assemble' script builds your application source so that it is ready to run. # diff --git a/modules/kogito-s2i-builder/s2i/bin/usage b/modules/kogito-s2i-builder/s2i/bin/usage index a1df5f9d5..416d0f117 100644 --- a/modules/kogito-s2i-builder/s2i/bin/usage +++ b/modules/kogito-s2i-builder/s2i/bin/usage @@ -1,4 +1,22 @@ #!/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. +# IMAGE_NAME="quay.io/kiegroup/kogito-s2i-builder" RUNTIME_JVM_IMAGE_NAME="quay.io/kiegroup/kogito-runtime-jvm" diff --git a/modules/kogito-s2i-core/added/s2i-core b/modules/kogito-s2i-core/added/s2i-core index d25870f82..46ff1a609 100644 --- a/modules/kogito-s2i-core/added/s2i-core +++ b/modules/kogito-s2i-core/added/s2i-core @@ -1,4 +1,22 @@ #!/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. +# # imports source "${KOGITO_HOME}"/launch/logging.sh @@ -136,7 +154,7 @@ function build_kogito_app() { -DprojectGroupId=$PROJECT_GROUP_ID \ -DprojectArtifactId=$PROJECT_ARTIFACT_ID \ -DprojectVersion=$PROJECT_VERSION \ - -Dextensions="kogito,quarkus-smallrye-health,quarkus-smallrye-openapi,quarkus-resteasy,quarkus-resteasy-jackson" + -Dextensions="org.kie.kogito:kogito-quarkus:${KOGITO_VERSION},quarkus-smallrye-health,quarkus-smallrye-openapi,quarkus-resteasy,quarkus-resteasy-jackson" if [ ! -z ${QUARKUS_EXTRA_EXTENSIONS} ]; then log_info "----> Adding extra Quarkus extensions: ${QUARKUS_EXTRA_EXTENSIONS}" @@ -218,7 +236,7 @@ function build_kogito_app() { $MAVEN_HOME/bin/mvn ${MAVEN_ARGS_APPEND} -s "${MAVEN_SETTINGS_PATH}" $(get_quarkus_platform_properties) \ "${quarkus_plugin}":"${quarkus_platform_version}":add-extension \ - -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow" + -Dextensions="org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION}" fi $MAVEN_HOME/bin/mvn clean package ${MAVEN_ARGS_APPEND} ${KOGITO_OPTS} ${nativeBuild} -s "${MAVEN_SETTINGS_PATH}" \ diff --git a/modules/kogito-s2i-core/configure.sh b/modules/kogito-s2i-core/configure.sh index e61ce36f4..3b2991106 100644 --- a/modules/kogito-s2i-core/configure.sh +++ b/modules/kogito-s2i-core/configure.sh @@ -1,4 +1,23 @@ #!/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. +# + # Configure module set -e diff --git a/modules/kogito-s2i-core/module.yaml b/modules/kogito-s2i-core/module.yaml index c2b294853..27f67a4e3 100644 --- a/modules/kogito-s2i-core/module.yaml +++ b/modules/kogito-s2i-core/module.yaml @@ -1,6 +1,24 @@ +# +# 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.s2i.core -version: '2.0.0-snapshot' +version: '999-SNAPSHOT' description: Kogito s2i core module. All s2i files shoul be placed here. labels: diff --git a/modules/kogito-s2i-core/s2i/bin/assemble-runtime b/modules/kogito-s2i-core/s2i/bin/assemble-runtime index 8beb2d20a..e9b027587 100644 --- a/modules/kogito-s2i-core/s2i/bin/assemble-runtime +++ b/modules/kogito-s2i-core/s2i/bin/assemble-runtime @@ -1,5 +1,22 @@ #!/bin/bash -e # +# 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. +# # S2I assemble-runtime script for the 'kogito-runtime-native' image. # The assemble-runtime script executes preparation for running the container on runtime image. # diff --git a/modules/kogito-s2i-core/s2i/bin/run b/modules/kogito-s2i-core/s2i/bin/run index e4379a95a..3294dc1db 100644 --- a/modules/kogito-s2i-core/s2i/bin/run +++ b/modules/kogito-s2i-core/s2i/bin/run @@ -1,3 +1,21 @@ #!/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. +# set -e exec "${KOGITO_HOME}"/kogito-app-launch.sh ${1} \ No newline at end of file diff --git a/modules/kogito-s2i-core/s2i/bin/save-artifacts b/modules/kogito-s2i-core/s2i/bin/save-artifacts index 46e04c060..114e50a2a 100644 --- a/modules/kogito-s2i-core/s2i/bin/save-artifacts +++ b/modules/kogito-s2i-core/s2i/bin/save-artifacts @@ -1,5 +1,23 @@ -#!/usr/bin/env bash +#!/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. +# cd ${HOME} tar cf - .m2 diff --git a/modules/kogito-s2i-core/tests/bats/s2i-core.bats b/modules/kogito-s2i-core/tests/bats/s2i-core.bats index 714ed4c9c..40e71fddf 100644 --- a/modules/kogito-s2i-core/tests/bats/s2i-core.bats +++ b/modules/kogito-s2i-core/tests/bats/s2i-core.bats @@ -1,4 +1,23 @@ #!/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=$BATS_TMPDIR/kogito_home mkdir -p "${KOGITO_HOME}"/{bin,launch} @@ -443,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-swf/builder/build-config/module.yaml b/modules/kogito-swf/builder/build-config/module.yaml index b90ef48bc..79fac6fe4 100644 --- a/modules/kogito-swf/builder/build-config/module.yaml +++ b/modules/kogito-swf/builder/build-config/module.yaml @@ -1,6 +1,24 @@ +# +# 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.swf.builder.build-config -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Kogito Serverless Workflow builder image build configuration" envs: @@ -9,4 +27,4 @@ envs: - name: QUARKUS_EXTENSIONS # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too! # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270 - value: quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION} + value: quarkus-kubernetes,smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-events-process:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION} diff --git a/modules/kogito-swf/builder/runtime/community/configure.sh b/modules/kogito-swf/builder/runtime/community/configure.sh index 0f0bc8e91..14d76b745 100644 --- a/modules/kogito-swf/builder/runtime/community/configure.sh +++ b/modules/kogito-swf/builder/runtime/community/configure.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e SOURCES_DIR=/tmp/artifacts diff --git a/modules/kogito-swf/builder/runtime/community/module.yaml b/modules/kogito-swf/builder/runtime/community/module.yaml index fe19031ac..0a4d41728 100644 --- a/modules/kogito-swf/builder/runtime/community/module.yaml +++ b/modules/kogito-swf/builder/runtime/community/module.yaml @@ -1,6 +1,24 @@ +# +# 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.swf.builder.runtime.community -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Kogito Serverless Workflow builder runtime module" artifacts: diff --git a/modules/kogito-swf/builder/runtime/osl/configure.sh b/modules/kogito-swf/builder/runtime/osl/configure.sh index d4c58e01d..70c258fa6 100644 --- a/modules/kogito-swf/builder/runtime/osl/configure.sh +++ b/modules/kogito-swf/builder/runtime/osl/configure.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e SOURCES_DIR=/tmp/artifacts diff --git a/modules/kogito-swf/builder/runtime/osl/module.yaml b/modules/kogito-swf/builder/runtime/osl/module.yaml index 9758f7be5..b126715ce 100644 --- a/modules/kogito-swf/builder/runtime/osl/module.yaml +++ b/modules/kogito-swf/builder/runtime/osl/module.yaml @@ -1,3 +1,21 @@ +# +# 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.swf.builder.runtime.osl version: "1.30.0" diff --git a/modules/kogito-swf/common/build/added/cleanup_project.sh b/modules/kogito-swf/common/build/added/cleanup_project.sh index 2a2309248..b3c12a336 100755 --- a/modules/kogito-swf/common/build/added/cleanup_project.sh +++ b/modules/kogito-swf/common/build/added/cleanup_project.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e #remove unnecessary files diff --git a/modules/kogito-swf/common/build/added/zip_files.sh b/modules/kogito-swf/common/build/added/zip_files.sh index f6ef2559c..31e30ec6f 100755 --- a/modules/kogito-swf/common/build/added/zip_files.sh +++ b/modules/kogito-swf/common/build/added/zip_files.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e BUILD_OUTPUT="${KOGITO_HOME}"/build_output/ diff --git a/modules/kogito-swf/common/build/configure.sh b/modules/kogito-swf/common/build/configure.sh index 30c62f5ea..50897c656 100644 --- a/modules/kogito-swf/common/build/configure.sh +++ b/modules/kogito-swf/common/build/configure.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" diff --git a/modules/kogito-swf/common/build/module.yaml b/modules/kogito-swf/common/build/module.yaml index ad782c42a..8f277cd9f 100644 --- a/modules/kogito-swf/common/build/module.yaml +++ b/modules/kogito-swf/common/build/module.yaml @@ -1,6 +1,24 @@ +# +# 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.swf.common.build -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Kogito Serverless Workflow image build process" packages: diff --git a/modules/kogito-swf/common/scripts/added/add-extension.sh b/modules/kogito-swf/common/scripts/added/add-extension.sh index 2ef004a8c..82a023ace 100755 --- a/modules/kogito-swf/common/scripts/added/add-extension.sh +++ b/modules/kogito-swf/common/scripts/added/add-extension.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)" diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh index 2f661aed4..c85927c4b 100755 --- a/modules/kogito-swf/common/scripts/added/build-app.sh +++ b/modules/kogito-swf/common/scripts/added/build-app.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)" diff --git a/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh b/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh index bad548b6c..cd8292cc0 100755 --- a/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh +++ b/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -Dmaven.compiler.release=${JAVA_VERSION}" diff --git a/modules/kogito-swf/common/scripts/added/create-app.sh b/modules/kogito-swf/common/scripts/added/create-app.sh index 6153a02d9..ad25fb66f 100755 --- a/modules/kogito-swf/common/scripts/added/create-app.sh +++ b/modules/kogito-swf/common/scripts/added/create-app.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)" @@ -104,9 +123,11 @@ if [ "${SCRIPT_DEBUG^^}" = "TRUE" ]; then cat pom.xml fi +# we force the dependencies download beforehand, so we won't have problems when running or building our apps in offline mode +# see: +# https://quarkus.io/guides/maven-tooling#downloading-maven-artifact-dependencies-for-offline-development-and-testing +# https://maven.apache.org/plugins/maven-dependency-plugin/go-offline-mojo.html "${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \ -nsu \ -s "${MAVEN_SETTINGS_PATH}" \ - -DskipTests \ - -Dquarkus.container-image.build=false \ - clean install + clean dependency:go-offline io.quarkus.platform:quarkus-maven-plugin:"${QUARKUS_PLATFORM_VERSION}":go-offline diff --git a/modules/kogito-swf/common/scripts/added/jvm-settings.sh b/modules/kogito-swf/common/scripts/added/jvm-settings.sh index b2c3e4ce9..b8a1fce95 100755 --- a/modules/kogito-swf/common/scripts/added/jvm-settings.sh +++ b/modules/kogito-swf/common/scripts/added/jvm-settings.sh @@ -1,4 +1,23 @@ #!/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. +# + # Calculate the java memory for the given maven build. # It is based in the container-limits that can be found in # https://github.com/jboss-openshift/cct_module/blob/master/jboss/container/java/jvm/bash/artifacts/opt/jboss/container/java/jvm/container-limits diff --git a/modules/kogito-swf/common/scripts/configure.sh b/modules/kogito-swf/common/scripts/configure.sh index 2beff0e3f..8fa4b8798 100644 --- a/modules/kogito-swf/common/scripts/configure.sh +++ b/modules/kogito-swf/common/scripts/configure.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" diff --git a/modules/kogito-swf/common/scripts/module.yaml b/modules/kogito-swf/common/scripts/module.yaml index 46b0e37ca..4d10be8a3 100644 --- a/modules/kogito-swf/common/scripts/module.yaml +++ b/modules/kogito-swf/common/scripts/module.yaml @@ -1,11 +1,29 @@ +# +# 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.swf.common.scripts -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Kogito Serverless Workflow image common scripts" envs: - name: QUARKUS_EXTENSIONS - example: 'quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing' + example: 'quarkus-kubernetes,org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION}' description: To add extension to your application - name: PROJECT_GROUP_ID diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats index d0993822d..9ffce5d37 100644 --- a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats +++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats @@ -1,4 +1,22 @@ #!/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. +# setup() { export KOGITO_HOME=/tmp/kogito diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats index 3c67ff1ec..a0487e8d4 100644 --- a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats +++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats @@ -1,4 +1,23 @@ #!/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}" @@ -22,7 +41,7 @@ teardown() { source ${KOGITO_HOME}/launch/jvm-settings.sh echo "MAVEN_OPTS is: ${MAVEN_OPTS}" - [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]] + [[ "${MAVEN_OPTS}" == *"-XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]] } @test "run jvm-settings with custom conf" { @@ -34,5 +53,5 @@ teardown() { source ${KOGITO_HOME}/launch/jvm-settings.sh echo "MAVEN_OPTS is: ${MAVEN_OPTS}" - [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelOldGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]] + [[ "${MAVEN_OPTS}" == *"-Xmx1024m -Xms512m -Xotherthing -XX:+UseParallelGC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:+ExitOnOutOfMemoryError"* ]] } diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/kogito-swf/devmode/build-config/module.yaml index 740e48b4f..292e0535c 100644 --- a/modules/kogito-swf/devmode/build-config/module.yaml +++ b/modules/kogito-swf/devmode/build-config/module.yaml @@ -1,6 +1,24 @@ +# +# 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.swf.devmode.build-config -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Kogito Serverless Workflow devmode image build configuration" envs: @@ -9,4 +27,4 @@ envs: - name: QUARKUS_EXTENSIONS # NOTE: If you change the QUARKUS_EXTENSIONS value remember to update the scripts/logic/build-quarkus-app.sh too! # Follow up issue to remove KOGITO_VERSION: https://issues.redhat.com/browse/KOGITO-9270 - value: kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,kogito-addons-quarkus-jobs-service-embedded,kogito-addons-quarkus-data-index-inmemory,org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION} + value: org.kie.kogito:kogito-quarkus-serverless-workflow:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-eventing:${KOGITO_VERSION},smallrye-health,org.kie.kogito:kogito-quarkus-serverless-workflow-devui:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-source-files:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-process-management:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-kubernetes:${KOGITO_VERSION},org.kie.kogito:kogito-addons-quarkus-knative-serving:${KOGITO_VERSION} diff --git a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh index 295ce739f..d929b29aa 100755 --- a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh +++ b/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)" diff --git a/modules/kogito-swf/devmode/runtime/common/configure.sh b/modules/kogito-swf/devmode/runtime/common/configure.sh index 7eb338429..582997ada 100644 --- a/modules/kogito-swf/devmode/runtime/common/configure.sh +++ b/modules/kogito-swf/devmode/runtime/common/configure.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" diff --git a/modules/kogito-swf/devmode/runtime/common/module.yaml b/modules/kogito-swf/devmode/runtime/common/module.yaml index c99b9da25..cad1b7061 100644 --- a/modules/kogito-swf/devmode/runtime/common/module.yaml +++ b/modules/kogito-swf/devmode/runtime/common/module.yaml @@ -1,6 +1,24 @@ +# +# 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.swf.devmode.runtime.common -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Kogito Serverless Workflow devmode common module" execute: diff --git a/modules/kogito-swf/devmode/runtime/community/configure.sh b/modules/kogito-swf/devmode/runtime/community/configure.sh index 87cc1b18a..efe6f6089 100644 --- a/modules/kogito-swf/devmode/runtime/community/configure.sh +++ b/modules/kogito-swf/devmode/runtime/community/configure.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" diff --git a/modules/kogito-swf/devmode/runtime/community/module.yaml b/modules/kogito-swf/devmode/runtime/community/module.yaml index 7c6026c8a..c48ec7281 100644 --- a/modules/kogito-swf/devmode/runtime/community/module.yaml +++ b/modules/kogito-swf/devmode/runtime/community/module.yaml @@ -1,6 +1,24 @@ +# +# 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.swf.devmode.runtime.community -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" description: "Kogito Serverless Workflow devmode with required extensions" envs: diff --git a/modules/kogito-swf/devmode/runtime/osl/configure.sh b/modules/kogito-swf/devmode/runtime/osl/configure.sh index 6c11bdb8d..a72caf961 100644 --- a/modules/kogito-swf/devmode/runtime/osl/configure.sh +++ b/modules/kogito-swf/devmode/runtime/osl/configure.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" diff --git a/modules/kogito-swf/devmode/runtime/osl/module.yaml b/modules/kogito-swf/devmode/runtime/osl/module.yaml index d2cba2a89..6da3562f7 100644 --- a/modules/kogito-swf/devmode/runtime/osl/module.yaml +++ b/modules/kogito-swf/devmode/runtime/osl/module.yaml @@ -1,3 +1,21 @@ +# +# 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.swf.devmode.runtime.osl version: "1.30.0" diff --git a/modules/kogito-system-user/add-user b/modules/kogito-system-user/add-user index 8f0ca3545..cd5c209fc 100644 --- a/modules/kogito-system-user/add-user +++ b/modules/kogito-system-user/add-user @@ -1,5 +1,22 @@ #!/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. +# groupadd -r kogito -g 1001 && useradd -u 1001 -r -g root -G "${USER}" -m -d "${KOGITO_HOME}" -s /sbin/nologin -c "Kogito user" ${USER} mkdir "${KOGITO_HOME}"/bin diff --git a/modules/kogito-system-user/module.yaml b/modules/kogito-system-user/module.yaml index a1da8a916..74788b3e2 100644 --- a/modules/kogito-system-user/module.yaml +++ b/modules/kogito-system-user/module.yaml @@ -1,6 +1,24 @@ +# +# 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.system.user -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" execute: - script: add-user diff --git a/modules/kogito-task-console/added/kogito-app-launch.sh b/modules/kogito-task-console/added/kogito-app-launch.sh index 6e80c75f9..538dc5490 100644 --- a/modules/kogito-task-console/added/kogito-app-launch.sh +++ b/modules/kogito-task-console/added/kogito-app-launch.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-task-console/added/launch/kogito-task-console.sh b/modules/kogito-task-console/added/launch/kogito-task-console.sh index c88f8474a..1b6a600e3 100644 --- a/modules/kogito-task-console/added/launch/kogito-task-console.sh +++ b/modules/kogito-task-console/added/launch/kogito-task-console.sh @@ -1,4 +1,23 @@ #!/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 diff --git a/modules/kogito-task-console/configure b/modules/kogito-task-console/configure index 484f7192a..1c6659a10 100644 --- a/modules/kogito-task-console/configure +++ b/modules/kogito-task-console/configure @@ -1,4 +1,22 @@ #!/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 diff --git a/modules/kogito-task-console/module.yaml b/modules/kogito-task-console/module.yaml index 1d8ebd5a8..43d5667f0 100644 --- a/modules/kogito-task-console/module.yaml +++ b/modules/kogito-task-console/module.yaml @@ -1,6 +1,24 @@ +# +# 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.task.console -version: "2.0.0-snapshot" +version: "999-SNAPSHOT" # see build-kogito-apps-components.sh script, responsible for build it. # called by the Makefile before builds diff --git a/modules/kogito-task-console/tests/bats/kogito-task-console.bats b/modules/kogito-task-console/tests/bats/kogito-task-console.bats index 33a0a1eed..ac1de079f 100644 --- a/modules/kogito-task-console/tests/bats/kogito-task-console.bats +++ b/modules/kogito-task-console/tests/bats/kogito-task-console.bats @@ -1,4 +1,23 @@ #!/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}" 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 02a945df2..000000000 --- a/modules/kogito-trusty-common/added/launch/kogito-trusty.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -#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 01239faa1..000000000 --- a/modules/kogito-trusty-common/configure +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -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 282ebc181..000000000 --- a/modules/kogito-trusty-common/module.yaml +++ /dev/null @@ -1,7 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.trusty.common -version: "2.0.0-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 fc3ab97f2..000000000 --- a/modules/kogito-trusty-common/tests/bats/kogito-trusty-common.bats +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bats - -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 2caba923a..000000000 --- a/modules/kogito-trusty-infinispan/added/kogito-app-launch.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -#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 fdc160143..000000000 --- a/modules/kogito-trusty-infinispan/configure +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -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 0338735d4..000000000 --- a/modules/kogito-trusty-infinispan/module.yaml +++ /dev/null @@ -1,13 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.trusty.infinispan -version: "2.0.0-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 2caba923a..000000000 --- a/modules/kogito-trusty-postgresql/added/kogito-app-launch.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -#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 a2e9d4027..000000000 --- a/modules/kogito-trusty-postgresql/configure +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -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 0477bc4bb..000000000 --- a/modules/kogito-trusty-postgresql/module.yaml +++ /dev/null @@ -1,13 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.trusty.postgresql -version: "2.0.0-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 2caba923a..000000000 --- a/modules/kogito-trusty-redis/added/kogito-app-launch.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -#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 132ba7784..000000000 --- a/modules/kogito-trusty-redis/configure +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -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 20ebe8c86..000000000 --- a/modules/kogito-trusty-redis/module.yaml +++ /dev/null @@ -1,13 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.trusty.redis -version: "2.0.0-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 18ff16a26..000000000 --- a/modules/kogito-trusty-ui/added/kogito-app-launch.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -#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 f8a16c7d6..000000000 --- a/modules/kogito-trusty-ui/added/launch/kogito-trusty-ui.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env bash - -#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 41a4214e0..000000000 --- a/modules/kogito-trusty-ui/configure +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -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 6ee43fbee..000000000 --- a/modules/kogito-trusty-ui/module.yaml +++ /dev/null @@ -1,13 +0,0 @@ -schema_version: 1 -name: org.kie.kogito.trusty.ui -version: "2.0.0-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 1eb510ab8..000000000 --- a/modules/kogito-trusty-ui/tests/bats/kogito-trusty-ui.bats +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env bats - -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 821a9250f..000000000 --- a/modules/rhpam-kogito-prod-profile/configure +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -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 67dbec0da..000000000 --- a/modules/rhpam-kogito-prod-profile/module.yaml +++ /dev/null @@ -1,12 +0,0 @@ -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 5d497c874..000000000 --- a/osbs-extra/logic-data-index-ephemeral-rhel8/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !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 f23861d00..000000000 --- a/osbs-extra/logic-swf-builder-rhel8/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !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 0369c3ed3..000000000 --- a/osbs-extra/logic-swf-devmode-rhel8/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !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 236bfdfb6..000000000 --- a/osbs-extra/rhpam-kogito-builder-rhel8/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !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 e1769f0b5..000000000 --- a/osbs-extra/rhpam-kogito-runtime-jvm-rhel8/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !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 31dbaac8c..000000000 --- a/osbs-extra/rhpam-kogito-runtime-native-rhel8/gating.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- !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 6b13cceba..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. @@ -191,10 +158,10 @@ This will set the default artifacts version. ##### Update quarkus version ```bash -$ python update-repository.py --quarkus-platform-version 2.16.7.Final +$ python update-repository.py --quarkus-platform-version 3.2.9.Final ``` -This will set the image quarkus version to 2.16.0.Final. +This will set the image quarkus version to 3.2.9.Final. ##### Update Examples URI and Ref diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh index 9c77acbe7..ddaada7d8 100755 --- a/scripts/build-kogito-apps-components.sh +++ b/scripts/build-kogito-apps-components.sh @@ -1,4 +1,23 @@ #!/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. +# + # Parameters: # 1 - image name - can't be empty. # 2 - git target branch - defaults to main @@ -41,51 +60,19 @@ 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" ;; "kogito-jobs-service-allinone") extended_context="-all-in-one" contextDir="jobs-service/jobs-service-inmemory" - contextDir="${contextDir} jobs-service/jobs-service-infinispan" 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 cd2ae0e75..000000000 --- a/scripts/build-osbs.sh +++ /dev/null @@ -1,223 +0,0 @@ -#!/bin/bash -# Copyright 2020 Red Hat, Inc. and/or its affiliates -# -# Licensed 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 0a007f7cb..000000000 --- a/scripts/build-product-image.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash -# 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 e0659e818..9398669b7 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -1,4 +1,23 @@ #!/usr/bin/python +# +# 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. +# + # This script defines some common function that are used by manage-kogito-version.py and push-staging.py script @@ -11,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" @@ -29,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(): @@ -65,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. @@ -91,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: @@ -141,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 @@ -183,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 @@ -242,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) @@ -280,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): """ @@ -323,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): """ @@ -396,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(): @@ -481,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 @@ -490,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) @@ -572,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 @@ -581,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) @@ -688,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 e982d164b..9d77880cd 100644 --- a/scripts/list-images.py +++ b/scripts/list-images.py @@ -1,4 +1,23 @@ #!/usr/bin/env python +# +# 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. +# + # Script responsible to update the tests with # Should be run from root directory of the repository @@ -14,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') @@ -25,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/logic/build-quarkus-app.sh b/scripts/logic/build-quarkus-app.sh deleted file mode 100755 index 8f127f0ee..000000000 --- a/scripts/logic/build-quarkus-app.sh +++ /dev/null @@ -1,194 +0,0 @@ -#!/usr/bin/env bash -# Parameters: -# 1 - Image name -# 2 - Quarkus platform group id -# 3 - Quarkus platform version -# 4 - Kogito version -# Note that all parameters are required and can't be empty - -# fast fail -set -e -set -o pipefail - -# Read entries before sourcing -image_name="${1}" -quarkus_platform_groupid="${2}" -quarkus_platform_version="${3}" -kogito_version="${KOGITO_VERSION:-${4}}" - -# GAV of maven plugins to be injected in the plugin management section -maven_plugins_gav=("org.apache.maven.plugins:maven-resources-plugin:3.3.1" "org.apache.maven.plugins:maven-install-plugin:3.1.1" "org.apache.maven.plugins:maven-jar-plugin:3.3.0" "org.apache.maven.plugins:maven-clean-plugin:3.3.1") - -# Properties to be replaced in the pom by the new versions -properties_with_versions=("compiler-plugin.version:3.11.0" "surefire-plugin.version:3.1.2") - -# arch specific dependencies -quarkus_extensions_arch_specific="com.aayushatharva.brotli4j:native-linux-aarch64:1.8.0" -# common extensions used by the kogito-swf-builder and kogito-swf-devmode -quarkus_extensions="quarkus-kubernetes,kogito-quarkus-serverless-workflow,kogito-addons-quarkus-knative-eventing,smallrye-health,org.kie.kogito:kogito-addons-quarkus-microprofile-config-service-catalog:${kogito_version},org.kie.kogito:kogito-addons-quarkus-kubernetes:${kogito_version}" -# dev mode purpose extensions used only by the kogito-swf-devmode -kogito_swf_devmode_extensions="kogito-quarkus-serverless-workflow-devui,kogito-addons-quarkus-source-files,kogito-addons-quarkus-process-management,org.kie.kogito:kogito-addons-quarkus-jobs-service-embedded:${kogito_version},org.kie.kogito:kogito-addons-quarkus-data-index-inmemory:${kogito_version}" -# builder/prod extensitons used only by the kogito-swf-builder -kogito_swf_builder_extensions="org.kie.kogito:kogito-addons-quarkus-events-process:${kogito_version},org.kie.kogito:kogito-addons-quarkus-process-management:${kogito_version},org.kie.kogito:kogito-addons-quarkus-source-files:${kogito_version}" - -if [ -z ${quarkus_platform_version} ]; then - echo "Please provide the quarkus version" - exit 1 -fi - -case ${image_name} in - "kogito-swf-builder") - quarkus_extensions="${quarkus_extensions},${kogito_swf_builder_extensions},${quarkus_extensions_arch_specific}" - ;; - "kogito-swf-devmode") - quarkus_extensions="${quarkus_extensions},${kogito_swf_devmode_extensions},${quarkus_extensions_arch_specific}" - ;; - *) - echo "${image_name} is not a quarkus app image, exiting..." - exit 0 - ;; -esac - - -target_tmp_dir="/tmp/build/${image_name}" -build_target_dir="/tmp/${image_name}" -mvn_local_repo="/tmp/temp_maven/${image_name}" - -rm -rf ${target_tmp_dir} && mkdir -p ${target_tmp_dir} -rm -rf ${build_target_dir} && mkdir -p ${build_target_dir} -if [ "${CI}" = "true" ]; then - # On CI we want to make sure we remove all artifacts from maven repo - rm -rf ${mvn_local_repo} -fi -mkdir -p ${mvn_local_repo} - -if [ "${NIGHTLY}" = "true" ]; then - # In case of a nightly, the Kogito/Drools artifacts are not deployed anywhere, so they need to be copied - # inside the maven repo local folder - cp -rp ${NIGHTLY_DEPLOY_FOLDER}/* ${mvn_local_repo} -fi - -set -x -echo "Create quarkus project to path ${build_target_dir}" -cd ${build_target_dir} -mvn ${MAVEN_OPTIONS} \ - -Dmaven.repo.local=${mvn_local_repo} \ - -DprojectGroupId="org.acme" \ - -DprojectArtifactId="serverless-workflow-project" \ - -DprojectVersionId="1.0.0-SNAPSHOT" \ - -DplatformVersion="${quarkus_platform_version}" \ - -Dextensions="${quarkus_extensions}" \ - "${quarkus_platform_groupid}":quarkus-maven-plugin:"${quarkus_platform_version}":create - -# Fix as we cannot rely on Quarkus platform -# Should be removed once https://issues.redhat.com/browse/KOGITO-9120 is implemented -if [ ! -z ${kogito_version} ]; then - echo "Replacing Kogito Platform BOM with version ${kogito_version}" - # [ ]* -> is a regexp pattern to match any number of spaces - pattern_1="[ ]*.*<\/groupId>" - pattern_2="[ ]*quarkus-kogito-bom<\/artifactId>\n" - pattern_3="[ ]*.*<\/version>\n" - complete_pattern="$pattern_1\n$pattern_2$pattern_3" - - replace_1=" org.kie.kogito<\/groupId>\n" - replace_2=" kogito-bom<\/artifactId>\n" - replace_3=" ${kogito_version}<\/version>\n" - complete_replace="$replace_1$replace_2$replace_3" - - sed -i.bak -e "/$pattern_1/{ - N;N;N - s/$complete_pattern/$complete_replace/ - }" serverless-workflow-project/pom.xml -fi - - -# Inject empty plugin management section if not present in the pom.xml -if ! grep -q "" "serverless-workflow-project/pom.xml"; then - echo "Injecting empty plugin Management section as it does not exist in pom" - pattern_1="[ ]*" - complete_pattern="$pattern_1" - - replace_1=" <\build>\n" - replace_2=" \n" - replace_3=" \n" - replace_4=" <\/plugins>\n" - replace_5=" <\/pluginManagement>" - complete_replace="$replace_1$replace_2$replace_3$replace_4$replace_5" - - sed -i.bak -e "/$pattern_1/{ - N;N;N - s/$complete_pattern/$complete_replace/ - }" serverless-workflow-project/pom.xml -fi - -# Inject maven plugins into plugin management section -for gav in ${maven_plugins_gav[@]}; do - group_id=$(echo $gav | cut -f1 -d:) - artifact_id=$(echo $gav | cut -f2 -d:) - version=$(echo $gav | cut -f3 -d:) - - echo "Injecting ${gav} in plugin management section" - pattern_1="[ ]*" - pattern_2="[ ]*" - complete_pattern="$pattern_1\n$pattern_2" - - replace_1=" \n" - replace_2=" \n" - replace_3=" \n" - replace_4=" ${group_id}<\/groupId>\n" - replace_5=" ${artifact_id}<\/artifactId>\n" - replace_6=" ${version}<\/version>\n" - replace_7=" <\/plugin>" - complete_replace="$replace_1$replace_2$replace_3$replace_4$replace_5$replace_6$replace_7" - - sed -i.bak -e "/$pattern_1/{ - N;N;N - s/$complete_pattern/$complete_replace/ - }" serverless-workflow-project/pom.xml -done - -# Replace properties values by new values -for property_with_version in ${properties_with_versions[@]}; do - property=$(echo $property_with_version | cut -f1 -d:) - new_version=$(echo $property_with_version | cut -f2 -d:) - - echo "Replacing property ${property} with value ${new_version}" - complete_pattern="[ ]*<${property}>.*<\/${property}>" - complete_replace=" <${property}>${new_version}<\/${property}>" - sed -i.bak "s/$complete_pattern/$complete_replace/g" serverless-workflow-project/pom.xml -done - -echo "Build quarkus app" -cd "serverless-workflow-project" -# Quarkus version is enforced if some dependency pulled has older version of Quarkus set. -# This avoids to have, for example, Quarkus BOMs or other artifacts with multiple versions. -mvn ${MAVEN_OPTIONS} \ - -DskipTests \ - -Dmaven.repo.local=${mvn_local_repo} \ - -Dquarkus.container-image.build=false \ - clean install - -cd ${build_target_dir} - -#remove unnecessary files -rm -rfv serverless-workflow-project/target -rm -rfv serverless-workflow-project/src/main/resources/* -rm -rfv serverless-workflow-project/src/main/docker -rm -rfv serverless-workflow-project/.mvn/wrapper -rm -rfv serverless-workflow-project/mvnw* -rm -rfv serverless-workflow-project/src/test -rm -rfv serverless-workflow-project/*.bak - -# Maven useless files -# Needed to avoid Maven to automatically re-download from original Maven repository ... -find ${mvn_local_repo} -name _remote.repositories -type f -delete -find ${mvn_local_repo} -name _maven.repositories -type f -delete -find ${mvn_local_repo} -name *.lastUpdated -type f -delete - -echo "Zip and copy scaffold project" -zip -r ${image_name}-quarkus-app.zip serverless-workflow-project/ -cp -v ${image_name}-quarkus-app.zip ${target_tmp_dir}/ -echo "Zip and copy maven repo" -cd ${mvn_local_repo} -zip -r ${image_name}-maven-repo.zip * -cp -v ${image_name}-maven-repo.zip ${target_tmp_dir}/ \ No newline at end of file diff --git a/scripts/logic/builder-maven-repo/pom.xml b/scripts/logic/builder-maven-repo/pom.xml deleted file mode 100644 index a13ec8694..000000000 --- a/scripts/logic/builder-maven-repo/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - - org.kie.kogito - kogito-image-build-artifacts-parent - 2.0.0-SNAPSHOT - - - kogito-builder-maven-repository - Kogito Builder Quarkus App - Maven repository zip - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - /tmp/build/${build.quarkusapp.argument.imagename.builder}/${build.quarkusapp.argument.imagename.builder}-maven-repo.zip - zip - image-build - - - - - - - - - \ No newline at end of file diff --git a/scripts/logic/builder-quarkus-app/pom.xml b/scripts/logic/builder-quarkus-app/pom.xml deleted file mode 100644 index a243f0883..000000000 --- a/scripts/logic/builder-quarkus-app/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - - org.kie.kogito - kogito-image-build-artifacts-parent - 2.0.0-SNAPSHOT - - - kogito-builder-quarkus-app - Kogito Builder Quarkus App - Quarkus app zip - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - /tmp/build/${build.quarkusapp.argument.imagename.builder}/${build.quarkusapp.argument.imagename.builder}-quarkus-app.zip - zip - image-build - - - - - - - - - \ No newline at end of file diff --git a/scripts/logic/devmode-maven-repo/pom.xml b/scripts/logic/devmode-maven-repo/pom.xml deleted file mode 100644 index d666709f9..000000000 --- a/scripts/logic/devmode-maven-repo/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - - org.kie.kogito - kogito-image-build-artifacts-parent - 2.0.0-SNAPSHOT - - - kogito-devmode-maven-repository - Kogito Dev Mode Quarkus App - Maven repository zip - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - /tmp/build/${build.quarkusapp.argument.imagename.devmode}/${build.quarkusapp.argument.imagename.devmode}-maven-repo.zip - zip - image-build - - - - - - - - - \ No newline at end of file diff --git a/scripts/logic/devmode-quarkus-app/pom.xml b/scripts/logic/devmode-quarkus-app/pom.xml deleted file mode 100644 index b059e3cff..000000000 --- a/scripts/logic/devmode-quarkus-app/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - 4.0.0 - - - org.kie.kogito - kogito-image-build-artifacts-parent - 2.0.0-SNAPSHOT - - - kogito-devmode-quarkus-app - Kogito Dev Mode Quarkus App - Quarkus app zip - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-artifacts - package - - attach-artifact - - - - - /tmp/build/${build.quarkusapp.argument.imagename.devmode}/${build.quarkusapp.argument.imagename.devmode}-quarkus-app.zip - zip - image-build - - - - - - - - - \ No newline at end of file diff --git a/scripts/logic/pom.xml b/scripts/logic/pom.xml deleted file mode 100644 index 724a80fa6..000000000 --- a/scripts/logic/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - 4.0.0 - - org.kie.kogito - kogito-image-build-artifacts-parent - 2.0.0-SNAPSHOT - - Kogito image build artifacts - Maven project to build a Quarkus App with Kogito Serverless Worflow - pom - - http://kogito.kie.org - 2019 - - JBoss by Red Hat - http://www.jboss.org/ - - - - - Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - kogito-swf-devmode - kogito-swf-builder - io.quarkus.platform - 2.16.7.Final - 1.40.0.Final - - - - devmode-quarkus-app - devmode-maven-repo - builder-quarkus-app - builder-maven-repo - - - - - - org.codehaus.mojo - exec-maven-plugin - false - - - devmode-quarkus-app - compile - - exec - - - ${project.basedir}/build-quarkus-app.sh - - ${build.quarkusapp.argument.imagename.devmode} - ${build.quarkusapp.argument.quarkusplatform.groupid} - ${build.quarkusapp.argument.quarkusplatform.version} - ${build.quarkusapp.argument.kogitoversion} - - - - - builder-quarkus-app - compile - - exec - - - ${project.basedir}/build-quarkus-app.sh - - ${build.quarkusapp.argument.imagename.builder} - ${build.quarkusapp.argument.quarkusplatform.groupid} - ${build.quarkusapp.argument.quarkusplatform.version} - ${build.quarkusapp.argument.kogitoversion} - - - - - - - - \ No newline at end of file diff --git a/scripts/logic/test/behave_test.sh b/scripts/logic/test/behave_test.sh deleted file mode 100755 index c51077590..000000000 --- a/scripts/logic/test/behave_test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)" -source ${script_dir_path}/env_test.sh $@ - -echo "---- Pulling image ${image_full_tag} ----" -docker pull ${image_full_tag} - -echo "---- Run behave test for image ${image_id} ----" -cekit --descriptor ${image_descriptor_filename} test --image ${image_full_tag} behave diff --git a/scripts/logic/test/env_test.sh b/scripts/logic/test/env_test.sh deleted file mode 100755 index 14e8b904d..000000000 --- a/scripts/logic/test/env_test.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -export image_id=$1 -export image_full_tag=$2 - -export image_full_name=${image_full_tag%%:*} -export image_full_name=${image_full_name%%@sha256*} # Remove `@sha256` if needed -export image_registry_name=${image_full_name%/*} -export image_name=${image_full_name##*/} -export image_registry=${image_registry_name%/*} -export image_namespace=${image_registry_name##*/} - -export image_descriptor_filename=${image_id}-image.yaml - -export community_image_id=${image_id/logic-/kogito-} -export community_image_id=${community_image_id/-rhel8/} diff --git a/scripts/logic/test/shell_test.sh b/scripts/logic/test/shell_test.sh deleted file mode 100755 index 8a133425a..000000000 --- a/scripts/logic/test/shell_test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)" -source ${script_dir_path}/env_test.sh $@ - -echo "---- Pulling image ${image_full_tag} ----" -docker pull ${image_full_tag} - -echo "---- Run jBang test for image ${image_id} ----" -tests/shell/run.sh ${community_image_id} ${image_full_tag} diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py index 346215fa4..04cb161fb 100644 --- a/scripts/manage-kogito-version.py +++ b/scripts/manage-kogito-version.py @@ -1,4 +1,23 @@ #!/usr/bin/env python +# +# 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. +# + # This script will be responsible to help to manage kogito images and modules version, it will update all needed files # Example of usage: # # move the current version to the next one or rcX @@ -27,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() @@ -49,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/push-local-registry.sh b/scripts/push-local-registry.sh index 79d2ca899..1a3d1615d 100644 --- a/scripts/push-local-registry.sh +++ b/scripts/push-local-registry.sh @@ -1,4 +1,23 @@ #!/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/push-local-registry.sh ${REGISTRY} ${SHORTENED_LATEST_VERSION} ${NS} BUILD_ENGINE="docker" diff --git a/scripts/push-staging.py b/scripts/push-staging.py index 5fde35932..94d9dc184 100644 --- a/scripts/push-staging.py +++ b/scripts/push-staging.py @@ -1,4 +1,23 @@ #!/usr/bin/env python +# +# 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. +# + # This script will be responsible to fetch the latest rc tags from each image and define the next # rc tag to avoid images get overridden. # diff --git a/scripts/retrieve_version.py b/scripts/retrieve_version.py index b1b1c7a98..2a87cba96 100644 --- a/scripts/retrieve_version.py +++ b/scripts/retrieve_version.py @@ -1,4 +1,23 @@ #!/usr/bin/env python +# +# 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. +# + #Script responsible to update the tests with #Should be run from root directory of the repository #Sample usage: python scripts/retrieve_version.py diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh index 12e6684b3..c7e1adecc 100755 --- a/scripts/run-bats.sh +++ b/scripts/run-bats.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e @@ -10,14 +29,8 @@ 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/tests/bats +./bats/bin/bats modules/kogito-graalvm-scripts/common/tests/bats echo "----> running bats on kogito-jobs-service-common" ./bats/bin/bats modules/kogito-jobs-service-common/tests/bats @@ -31,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/setup-maven.sh b/scripts/setup-maven.sh index 5ec16cfb9..78be682df 100755 --- a/scripts/setup-maven.sh +++ b/scripts/setup-maven.sh @@ -1,9 +1,27 @@ #!/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. +# + # Holds common maven configuration for CI; # Usage: . setup-maven.sh -MAVEN_VERSION="3.8.x" -MVN_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-maven/${MAVEN_VERSION}" +MVN_MODULE="$(dirname "${BASH_SOURCE[0]}")/../modules/kogito-maven/common" export MAVEN_OPTIONS="${BUILD_MVN_OPTS} -DskipTests" # Do not remove below, this can be updated by the python scripts MAVEN_IGNORE_SELF_SIGNED_CERTIFICATE=true diff --git a/scripts/update-repository.py b/scripts/update-repository.py index 0ed9b8a2d..2583e4096 100644 --- a/scripts/update-repository.py +++ b/scripts/update-repository.py @@ -1,4 +1,23 @@ #!/usr/bin/env python +# +# 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. +# + #Script responsible to update the tests with #Should be run from root directory of the repository #Sample usage: python scripts/update-tests.py @@ -37,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: @@ -45,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() @@ -68,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 f7a7bf7b6..b543feba3 100644 --- a/tests/features/common-build-runtime.feature +++ b/tests/features/common-build-runtime.feature @@ -1,10 +1,11 @@ @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 + # See https://github.com/apache/incubator-kie-kogito-images/issues/1722 + @ignore Scenario: Verify if usage help is correctly called When container is started with command bash -c "sleep 5s; /home/kogito/kogito-app-launch.sh -h" Then container log should contain This is the diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature index c82cb8cc3..4184dc17c 100644 --- a/tests/features/common-custom-truststore.feature +++ b/tests/features/common-custom-truststore.feature @@ -1,24 +1,17 @@ @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 + @ignore Scenario: Verify if a custom certificate is correctly handled - When container is started with command bash -c "sleep 10s; /home/kogito/kogito-app-launch.sh" + When container is started with command bash -c "/home/kogito/kogito-app-launch.sh" | variable | value | | CUSTOM_TRUSTSTORE | my-truststore.jks | | RUNTIME_TYPE | quarkus | diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature index 35790b997..da33c0d08 100644 --- a/tests/features/common-dynamic-resources.feature +++ b/tests/features/common-dynamic-resources.feature @@ -1,24 +1,14 @@ -@quay.io/kiegroup/kogito-s2i-builder -@quay.io/kiegroup/kogito-runtime-jvm -@quay.io/kiegroup/kogito-data-index-infinispan +# Run only on images that won't die instantly +# 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-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-data-index-postgresql +#@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 +#@quay.io/kiegroup/kogito-jobs-service-postgresql +#@quay.io/kiegroup/kogito-management-console +#@quay.io/kiegroup/kogito-task-console 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-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature index 965bad01f..f50066570 100644 --- a/tests/features/data-index/kogito-data-index-ephemeral.feature +++ b/tests/features/data-index/kogito-data-index-ephemeral.feature @@ -21,4 +21,4 @@ Feature: Kogito-data-index ephemeral postgresql feature. When container is started with env | variable | value | | SCRIPT_DEBUG | true | - Then container log should contain -Dquarkus.profile=http-events-support + Then available container log should contain -Dquarkus.profile=http-events-support 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 9cac42d0b..000000000 --- a/tests/features/data-index/kogito-data-index-oracle.feature +++ /dev/null @@ -1,27 +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 | - | SCRIPT_DEBUG | true | - | 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 -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 java.sql.SQLException: Acquisition timeout while waiting for new connection - 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 \ No newline at end of file diff --git a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature index 636c458fb..395415190 100644 --- a/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature +++ b/tests/features/jobs-service/kogito-jobs-service-all-in-one.feature @@ -7,14 +7,12 @@ Feature: Kogito-jobs-service-all-in-one feature. 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 with all available jdbc providers And the image should contain label io.k8s.display-name with value Kogito Jobs Service All-in-One - And the image should contain label io.openshift.tags with value kogito,jobs-service,postgresql,mongodb,infinispan,ephemeral + And the image should contain label io.openshift.tags with value kogito,jobs-service,postgresql,ephemeral Scenario: Verify if all jobs-service flavors are in the image When container is started with command bash Then file /home/kogito/bin/ephemeral/quarkus-app/quarkus-run.jar should exist - And file /home/kogito/bin/infinispan/quarkus-app/quarkus-run.jar should exist And file /home/kogito/bin/postgresql/quarkus-app/quarkus-run.jar should exist - And file /home/kogito/bin/mongodb/quarkus-app/quarkus-run.jar should exist Scenario: Verify if the debug is correctly enabled with the ephemeral jar When container is started with env @@ -24,43 +22,13 @@ Feature: Kogito-jobs-service-all-in-one feature. And container log should contain started in And container log should not contain Application failed to start - Scenario: Infinispan - verify if auth is correctly set - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | JOBS_SERVICE_PERSISTENCE | infinispan | - | 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 - - Scenario: verify if the container is correctly started with mongo parameters - When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | JOBS_SERVICE_PERSISTENCE | mongodb | - | 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 - Scenario: verify if the container is started with invalid jobs-service flavor When container is started with env | variable | value | | SCRIPT_DEBUG | true | | JOBS_SERVICE_PERSISTENCE | something | Then container log should contain -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080 -jar /home/kogito/bin/ephemeral/quarkus-app/quarkus-run.jar - And container log should contain something is not supported, the allowed flavors are [ephemeral mongodb infinispan postgresql], defaulting to ephemeral + And container log should contain something is not supported, the allowed flavors are [ephemeral postgresql], defaulting to ephemeral Scenario: verify if container starts as expected When container is started with env 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 50ccacfd6..ab4bf8711 100644 --- a/tests/features/kogito-common-builder-jvm.feature +++ b/tests/features/kogito-common-builder-jvm.feature @@ -1,11 +1,11 @@ -@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 When container is started with command bash Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven - And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6 - And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11 + And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.9.3 + And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-17 Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main @@ -22,7 +22,6 @@ Feature: kogito-s2i-builder image JVM build tests | wait | 80 | | expected_phrase | ["hello","world"] | And file /home/kogito/bin/quarkus-run.jar should exist - And file /home/kogito/ssl-libs/libsunec.so should exist And file /home/kogito/cacerts should exist Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined @@ -39,9 +38,9 @@ Feature: kogito-s2i-builder image JVM build tests | wait | 80 | | expected_phrase | ["hello","world"] | And file /home/kogito/bin/quarkus-run.jar should exist - And file /home/kogito/ssl-libs/libsunec.so should exist And file /home/kogito/cacerts should exist + @ignore Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | @@ -61,6 +60,7 @@ Feature: kogito-s2i-builder image JVM build tests And container log should contain DEBUG [io.qua. And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Dquarkus.log.level=DEBUG + @ignore Scenario: Verify if the s2i build is finished as expected performing a non native build and if it is listening on the expected port , test uses custom properties file to test the port configuration. Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | @@ -77,6 +77,7 @@ Feature: kogito-s2i-builder image JVM build tests | expected_phrase | ["hello","world"] | And file /home/kogito/bin/quarkus-run.jar should exist + @ignore Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | @@ -119,6 +120,7 @@ Feature: kogito-s2i-builder image JVM build tests #### SpringBoot Scenarios + @ignore Scenario: Verify if the s2i build is finished as expected with debug enabled Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | @@ -155,6 +157,7 @@ Feature: kogito-s2i-builder image JVM build tests And container log should contain Started DemoApplication And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true + @ignore Scenario: Verify if the s2i build is finished as expected and if it is listening on the expected port, test uses custom properties file to test the port configuration. Given s2i build /tmp/kogito-examples from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty. @@ -172,6 +175,7 @@ Feature: kogito-s2i-builder image JVM build tests And file /home/kogito/bin/process-springboot-example.jar should exist And container log should contain Tomcat initialized with port(s): 8080 (http) + @ignore Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | @@ -214,6 +218,7 @@ Feature: kogito-s2i-builder image JVM build tests | content_type | application/json | | expected_status_code | 201 | + @ignore Scenario: Verify if the s2i build is finished as expected with uber-jar package type built Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | 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 2f2d6c369..79b8c98b8 100644 --- a/tests/features/kogito-common-runtime-jvm.feature +++ b/tests/features/kogito-common-runtime-jvm.feature @@ -1,12 +1,11 @@ @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 When container is started with command bash - Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11 + Then run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-17 And run sh -c 'echo $JAVA_VENDOR' in container and immediately check its output for openjdk - And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 11 + And run sh -c 'echo $JAVA_VERSION' in container and immediately check its output for 17 Scenario: Verify if the binary build is finished as expected and if it is listening on the expected port with quarkus Given s2i build /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld from target 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-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature index d5e78cc6d..4019e6d4f 100644 --- a/tests/features/kogito-s2i-builder-native.feature +++ b/tests/features/kogito-s2i-builder-native.feature @@ -3,17 +3,17 @@ Feature: kogito-s2i-builder image native build tests Scenario: verify java cacerts and libsunec are available in the given kogito builder container. When container is started with command bash - Then file /home/kogito/ssl-libs/libsunec.so should exist - And file /home/kogito/cacerts should exist + Then file /home/kogito/cacerts should exist Scenario: verify if the maven and graal vm settings are correct on kogito-s2i-builder image for native When container is started with command bash Then run sh -c 'echo $MAVEN_HOME' in container and immediately check its output for /usr/share/maven - And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.8.6 - And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11 + And run sh -c 'echo $MAVEN_VERSION' in container and immediately check its output for 3.9.3 + And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-17 And run sh -c 'echo $GRAALVM_HOME' in container and immediately check its output for /usr/share/graalvm - And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.3.2 + And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 23.0.2.1 + @ignore Scenario: Verify if the s2i build is finished as expected using native build and runtime image Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest | variable | value | @@ -48,10 +48,10 @@ Feature: kogito-s2i-builder image native build tests | wait | 80 | | expected_phrase | ["hello","world"] | And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist - And file /home/kogito/ssl-libs/libsunec.so should exist And file /home/kogito/cacerts should exist And s2i build log should contain -J-Xmx2576980378 + @ignore Scenario: Verify if the s2i build is finished as expected performing a native build and if it is listening on the expected port, test uses custom properties file to test the port configuration. Given s2i build /tmp/kogito-examples from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest | variable | value | @@ -70,6 +70,7 @@ Feature: kogito-s2i-builder image native build tests And file /home/kogito/bin/rules-quarkus-helloworld-runner should exist And s2i build log should contain -J-Xmx5153960755 + @ignore Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest | variable | value | @@ -107,13 +108,14 @@ Feature: kogito-s2i-builder image native build tests | wait | 80 | | expected_phrase | ["hello","world"] | + @ignore Scenario: Verify that the Kogito Maven archetype is generating the project and compiling it correctly using native build Given s2i build /tmp/kogito-examples from dmn-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | true | | LIMIT_MEMORY | 6442450944 | - | KOGITO_VERSION | 2.0.0-SNAPSHOT | + | KOGITO_VERSION | 999-SNAPSHOT | Then file /home/kogito/bin/project-1.0-SNAPSHOT-runner should exist And check that page is served | property | value | diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature index fe1cbfb84..9135d1e24 100644 --- a/tests/features/kogito-s2i-builder.feature +++ b/tests/features/kogito-s2i-builder.feature @@ -22,6 +22,7 @@ Feature: kogito-s2i-builder image tests And file /home/kogito/.m2/settings.xml should not contain redhat-techpreview-repository And file /home/kogito/.m2/settings.xml should not contain https://maven.repository.redhat.com/techpreview/all + @ignore Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | @@ -32,6 +33,7 @@ Feature: kogito-s2i-builder image tests And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto' And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto' + @ignore Scenario: Verify if the s2i build is finished as expected with persistence enabled Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | @@ -41,12 +43,13 @@ Feature: kogito-s2i-builder image tests And s2i build log should contain '/home/kogito/bin/demo.orders.proto' -> '/home/kogito/data/protobufs/demo.orders.proto' And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto' + @ignore 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 quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | false | - | KOGITO_VERSION | 2.0.0-SNAPSHOT | + | 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 io.quarkus.platform:quarkus-maven-plugin: @@ -68,13 +71,13 @@ Feature: kogito-s2i-builder image tests | content_type | application/json | | request_body | {"status": "UP", "checks": []} | - + @ignore 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 quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | false | - | KOGITO_VERSION | 2.0.0-SNAPSHOT | + | KOGITO_VERSION | 999-SNAPSHOT | | PROJECT_GROUP_ID | com.mycompany | | PROJECT_ARTIFACT_ID | myproject | | PROJECT_VERSION | 2.0-SNAPSHOT | @@ -90,12 +93,13 @@ Feature: kogito-s2i-builder image tests | content_type | application/json | | request_body | {"Driver": {"Points": 2}, "Violation": {"Type": "speed","Actual Speed": 120,"Speed Limit": 100}} | + @ignore Scenario: Verify that the Kogito Quarkus Serverless Workflow Extension is building the service properly Given s2i build /tmp/kogito-examples from serverless-workflow-examples/serverless-workflow-order-processing/src/main/resources using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | false | - | KOGITO_VERSION | 2.0.0-SNAPSHOT | + | KOGITO_VERSION | 999-SNAPSHOT | | PROJECT_GROUP_ID | com.mycompany | | PROJECT_ARTIFACT_ID | myproject | | PROJECT_VERSION | 2.0-SNAPSHOT | @@ -116,10 +120,11 @@ Feature: kogito-s2i-builder image tests #### SpringBoot Scenarios + @ignore 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 quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | - | KOGITO_VERSION | 2.0.0-SNAPSHOT | + | 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... 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 02e7c00be..65bc98115 100644 --- a/tests/features/kogito-swf-common.feature +++ b/tests/features/kogito-swf-common.feature @@ -1,13 +1,10 @@ @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 When container is started with command bash - Then file /home/kogito/.m2/repository/org/acme/serverless-workflow-project/1.0.0-SNAPSHOT/serverless-workflow-project-1.0.0-SNAPSHOT.jar should exist - And file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/2.16.10.Final/quarkus-bom-2.16.10.Final.pom should exist + Then file /home/kogito/.m2/repository/io/quarkus/platform/quarkus-bom/3.2.9.Final/quarkus-bom-3.2.9.Final.pom should exist And file /home/kogito/.m2/repository/org/kie/kogito/kogito-quarkus-serverless-workflow/ should exist and be a directory # This check should be enabled again once a similar check is done on runtimes diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature index 754ee5aaa..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 @@ -117,23 +116,22 @@ Feature: Serverless Workflow devmode images Then check that page is served | property | value | | port | 8080 | - | path | /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow/dataindex | + | path | /q/dev-v1/org.kie.kogito.kogito-quarkus-serverless-workflow/dataindex | | request_method | GET | | wait | 480 | | expected_status_code | 200 | And check that page is served | property | value | | port | 8080 | - | path | /q/dev/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/workflowInstances | + | path | /q/dev-v1/org.kie.kogito.kogito-quarkus-serverless-workflow-devui/workflowInstances | | request_method | GET | | wait | 480 | | expected_status_code | 200 | - Scenario: Verify if container starts in devmode with service discovery property + Scenario: Verify if container starts in devmode with service discovery enabled When container is started with env - | variable | value | - | SCRIPT_DEBUG | true | - | MAVEN_ARGS_APPEND | -Dkogito.dataindex.ws.url=${knative:services.v1.serving.knative.dev/namespace1/test2} | + | variable | value | + | QUARKUS_DEVSERVICES_ENABLED | false | Then check that page is served | property | value | | port | 8080 | @@ -141,7 +139,7 @@ Feature: Serverless Workflow devmode images | wait | 480 | | request_method | GET | | expected_status_code | 200 | - And container log should contain Service Discovery has failed on property [kogito.dataindex.ws.url + And container log should contain kogito-addon-microprofile-config-service-catalog-extension Scenario: Verify if container have the KOGITO_CODEGEN_PROCESS_FAILONERROR env set to false When container is started with command bash 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 01c5ef313..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 | 2.0.0-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 | 2.0.0-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 | 2.0.0-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 | 2.0.0-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/shell/README.md b/tests/shell/README.md new file mode 100644 index 000000000..687dc4d2f --- /dev/null +++ b/tests/shell/README.md @@ -0,0 +1,21 @@ +# Tests in Shell + +## Running Tests With JBang + +- Install JBang +- Install VSCode Red Hat's Java plugin +- Install VSCode JBang plugin + +You can then edit the files in `kogito-swf-builder` and `kogito-swf-devmode` with intellisense. + +The `run.sh` should be used to run the tests since it must set a few env vars. To run from your terminal, try: + +```shell +tests/shell/run.sh kogito-swf-devmode quay.io/kiegroup/kogito-swf-devmode:999-SNAPSHOT +``` + +The first argument is the test case to run and the second, the image. + +Under the hood, it uses [Junit's Console Launcher](https://junit.org/junit5/docs/current/user-guide/#running-tests-console-launcher) tool to run the tests from the command line. + +Update this file with new findings, and don't remove the `.vscode` folder. It's useful to run JBang from the IDE. diff --git a/tests/shell/kogito-swf-builder/.vscode/launch.json b/tests/shell/kogito-swf-builder/.vscode/launch.json new file mode 100644 index 000000000..f329b9513 --- /dev/null +++ b/tests/shell/kogito-swf-builder/.vscode/launch.json @@ -0,0 +1,22 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "RunTests-port-4004", + "request": "attach", + "hostName": "localhost", + "port": 4004 + }, + { + "type": "java", + "name": "Debug (Launch) - RunTests", + "request": "launch", + "mainClass": "RunTests", + "projectName": "RunTests" + } + ] +} diff --git a/tests/shell/kogito-swf-builder/.vscode/settings.json b/tests/shell/kogito-swf-builder/.vscode/settings.json new file mode 100644 index 000000000..ca7dd1980 --- /dev/null +++ b/tests/shell/kogito-swf-builder/.vscode/settings.json @@ -0,0 +1,18 @@ +{ + "java.import.gradle.enabled": false, + "java.import.maven.enabled": false, + "java.eclipse.downloadSources": true, + "files.exclude": { + "bin/": true, + ".eclipse/": true, + ".project": true, + ".classpath": true, + "build.gradle": true + }, + "java.completion.importOrder": [ + "", + "javax", + "java", + "#" + ] +} \ No newline at end of file diff --git a/tests/shell/kogito-swf-builder/RunTests.java b/tests/shell/kogito-swf-builder/RunTests.java deleted file mode 100644 index 8c5705028..000000000 --- a/tests/shell/kogito-swf-builder/RunTests.java +++ /dev/null @@ -1,118 +0,0 @@ -///usr/bin/env jbang "$0" "$@" ; exit $? - -//DEPS org.slf4j:slf4j-simple:2.0.6 - -// Junit console to start the test engine: -//DEPS org.junit.platform:junit-platform-console:1.8.2 - -// engine to run the tests (tests are written with Junit5): -//DEPS org.junit.jupiter:junit-jupiter-engine:5.8.2 - -// testcontainers -//DEPS org.testcontainers:testcontainers:1.17.6 -//DEPS org.testcontainers:junit-jupiter:1.17.6 - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.io.IOException; -import java.io.PrintWriter; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.http.HttpClient; -import java.net.http.HttpRequest; -import java.net.http.HttpResponse; -import java.net.http.HttpResponse.BodyHandlers; -import java.nio.file.Paths; -import java.time.Duration; -import java.util.Collections; - -import org.junit.jupiter.api.Test; -import org.junit.platform.console.options.CommandLineOptions; -import org.junit.platform.console.tasks.ConsoleTestExecutor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.output.Slf4jLogConsumer; -import org.testcontainers.containers.wait.strategy.Wait; -import org.testcontainers.images.builder.ImageFromDockerfile; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; - -@Testcontainers -public class RunTests { - - private static Logger LOGGER = LoggerFactory.getLogger(RunTests.class); - - private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER); - - @Container - private GenericContainer greetBuiltImage = new GenericContainer( - new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00)) - .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet", "Dockerfile")) - .withBuildArg("BUILDER_IMAGE_TAG", getTestImage())) - .withExposedPorts(8080) - .waitingFor(Wait.forHttp("/jsongreet")) - .withLogConsumer(logConsumer); - - @Test - public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException { - greetBuiltImage.start(); - HttpRequest request = HttpRequest.newBuilder() - .uri(new URI("http://" + greetBuiltImage.getHost() + ":" + greetBuiltImage.getFirstMappedPort() + "/jsongreet")) - .header("Content-Type", "application/json") - .header("Accept", "application/json") - .timeout(Duration.ofSeconds(10)) - .POST(HttpRequest.BodyPublishers - .ofString("{\"workflowdata\" : {\"name\": \"John\", \"language\": \"English\"}}")) - .build(); - HttpResponse response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString()); - assertEquals(201, response.statusCode()); - greetBuiltImage.stop(); - } - - @Container - private GenericContainer greetWithInputSchemaBuiltImage = new GenericContainer( - new ImageFromDockerfile("dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00)) - .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet-with-inputschema", "Dockerfile")) - .withBuildArg("BUILDER_IMAGE_TAG", getTestImage())) - .withExposedPorts(8080) - .waitingFor(Wait.forHttp("/greeting")) - .withLogConsumer(logConsumer); - - @Test - public void testBuiltContainerWithInputSchemaAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException { - greetWithInputSchemaBuiltImage.start(); - HttpRequest request = HttpRequest.newBuilder() - .uri(new URI("http://" + greetWithInputSchemaBuiltImage.getHost() + ":" + greetWithInputSchemaBuiltImage.getFirstMappedPort() + "/greeting")) - .header("Content-Type", "application/json") - .header("Accept", "application/json") - .timeout(Duration.ofSeconds(10)) - .POST(HttpRequest.BodyPublishers - .ofString("{\"name\": \"John\", \"language\": \"English\"}")) - .build(); - HttpResponse response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString()); - assertEquals(201, response.statusCode()); - greetWithInputSchemaBuiltImage.stop(); - } - - public static void main(String... args) throws Exception { - // Log docker build. Source: https://github.com/testcontainers/testcontainers-java/issues/3093 - System.setProperty("org.slf4j.simpleLogger.log.com.github.dockerjava.api.command.BuildImageResultCallback", "debug"); - CommandLineOptions options = new CommandLineOptions(); - options.setSelectedClasses(Collections.singletonList(RunTests.class.getName())); - options.setReportsDir(Paths.get(getOutputDir())); - new ConsoleTestExecutor(options).execute(new PrintWriter(System.out)); - } - - static String getTestImage() { - return System.getenv("TEST_IMAGE"); - } - - static String getOutputDir() { - return System.getenv("OUTPUT_DIR"); - } - - static String getScriptDirPath() { - return System.getenv("TESTS_SCRIPT_DIR_PATH"); - } -} \ No newline at end of file diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile index 3581d31c5..2172c7129 100644 --- a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile +++ b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile @@ -19,7 +19,7 @@ RUN "${KOGITO_HOME}"/launch/build-app.sh './resources' #============================= # Runtime Run #============================= -FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:latest +FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest ARG QUARKUS_LAUNCH_DEVMODE=false diff --git a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile index 3581d31c5..2172c7129 100644 --- a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile +++ b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile @@ -19,7 +19,7 @@ RUN "${KOGITO_HOME}"/launch/build-app.sh './resources' #============================= # Runtime Run #============================= -FROM registry.access.redhat.com/ubi8/openjdk-11-runtime:latest +FROM registry.access.redhat.com/ubi8/openjdk-17-runtime:latest ARG QUARKUS_LAUNCH_DEVMODE=false diff --git a/tests/shell/kogito-swf-builder/src/RunTests.java b/tests/shell/kogito-swf-builder/src/RunTests.java new file mode 100644 index 000000000..3cccdd702 --- /dev/null +++ b/tests/shell/kogito-swf-builder/src/RunTests.java @@ -0,0 +1,138 @@ +///usr/bin/env jbang "$0" "$@" ; exit $? + +// 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. + +//DEPS org.slf4j:slf4j-simple:2.0.9 + +// Junit console to start the test engine: +//DEPS org.junit.platform:junit-platform-console:1.10.1 + +// engine to run the tests (tests are written with Junit5): +//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1 + +// testcontainers +//DEPS org.testcontainers:testcontainers:1.19.3 +//DEPS org.testcontainers:junit-jupiter:1.19.3 + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.http.HttpClient; +import java.net.http.HttpRequest; +import java.net.http.HttpResponse; +import java.net.http.HttpResponse.BodyHandlers; +import java.nio.file.Paths; +import java.time.Duration; +import org.junit.jupiter.api.Test; +import org.junit.platform.console.ConsoleLauncher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testcontainers.containers.GenericContainer; +import org.testcontainers.containers.output.Slf4jLogConsumer; +import org.testcontainers.containers.wait.strategy.Wait; +import org.testcontainers.images.builder.ImageFromDockerfile; +import org.testcontainers.junit.jupiter.Container; +import org.testcontainers.junit.jupiter.Testcontainers; + +@Testcontainers +public class RunTests { + + private static Logger LOGGER = LoggerFactory.getLogger(RunTests.class); + + private Slf4jLogConsumer logConsumer = new Slf4jLogConsumer(LOGGER); + + @Container + private GenericContainer greetBuiltImage = new GenericContainer( + new ImageFromDockerfile( + "dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00)) + .withDockerfile(Paths.get(getScriptDirPath(), "resources/greet", "Dockerfile")) + .withBuildArg("BUILDER_IMAGE_TAG", getTestImage())) + .withExposedPorts(8080) + .waitingFor(Wait.forHttp("/jsongreet")) + .withLogConsumer(logConsumer); + + @Test + public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException { + greetBuiltImage.start(); + HttpRequest request = HttpRequest.newBuilder() + .uri(new URI("http://" + greetBuiltImage.getHost() + ":" + + greetBuiltImage.getFirstMappedPort() + "/jsongreet")) + .header("Content-Type", "application/json") + .header("Accept", "application/json") + .timeout(Duration.ofSeconds(10)) + .POST(HttpRequest.BodyPublishers + .ofString("{\"workflowdata\" : {\"name\": \"John\", \"language\": \"English\"}}")) + .build(); + HttpResponse response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString()); + assertEquals(201, response.statusCode()); + greetBuiltImage.stop(); + } + + @Container + private GenericContainer greetWithInputSchemaBuiltImage = new GenericContainer( + new ImageFromDockerfile( + "dev.local/jbang-test/swf-test:" + Math.round(Math.random() * 1000000.00)) + .withDockerfile(Paths.get(getScriptDirPath(), + "resources/greet-with-inputschema", "Dockerfile")) + .withBuildArg("BUILDER_IMAGE_TAG", getTestImage())) + .withExposedPorts(8080) + .waitingFor(Wait.forHttp("/greeting")) + .withLogConsumer(logConsumer); + + @Test + public void testBuiltContainerWithInputSchemaAnswerCorrectly() + throws URISyntaxException, IOException, InterruptedException { + greetWithInputSchemaBuiltImage.start(); + HttpRequest request = HttpRequest.newBuilder() + .uri(new URI("http://" + greetWithInputSchemaBuiltImage.getHost() + ":" + + greetWithInputSchemaBuiltImage.getFirstMappedPort() + "/greeting")) + .header("Content-Type", "application/json") + .header("Accept", "application/json") + .timeout(Duration.ofSeconds(10)) + .POST(HttpRequest.BodyPublishers + .ofString("{\"name\": \"John\", \"language\": \"English\"}")) + .build(); + HttpResponse response = HttpClient.newHttpClient().send(request, BodyHandlers.ofString()); + assertEquals(201, response.statusCode()); + greetWithInputSchemaBuiltImage.stop(); + } + + public static void main(String... args) throws Exception { + // Log docker build. Source: + // https://github.com/testcontainers/testcontainers-java/issues/3093 + System.setProperty( + "org.slf4j.simpleLogger.log.com.github.dockerjava.api.command.BuildImageResultCallback", + "debug"); + ConsoleLauncher.main("--select-class=" + RunTests.class.getName(), + "--reports-dir=" + Paths.get(getOutputDir()).toString()); + } + + static String getTestImage() { + return System.getenv("TEST_IMAGE"); + } + + static String getOutputDir() { + return System.getenv("OUTPUT_DIR"); + } + + static String getScriptDirPath() { + return System.getenv("TESTS_SCRIPT_DIR_PATH"); + } +} \ No newline at end of file diff --git a/tests/shell/kogito-swf-devmode/.vscode/launch.json b/tests/shell/kogito-swf-devmode/.vscode/launch.json new file mode 100644 index 000000000..f329b9513 --- /dev/null +++ b/tests/shell/kogito-swf-devmode/.vscode/launch.json @@ -0,0 +1,22 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "java", + "name": "RunTests-port-4004", + "request": "attach", + "hostName": "localhost", + "port": 4004 + }, + { + "type": "java", + "name": "Debug (Launch) - RunTests", + "request": "launch", + "mainClass": "RunTests", + "projectName": "RunTests" + } + ] +} diff --git a/tests/shell/kogito-swf-devmode/.vscode/settings.json b/tests/shell/kogito-swf-devmode/.vscode/settings.json new file mode 100644 index 000000000..ca7dd1980 --- /dev/null +++ b/tests/shell/kogito-swf-devmode/.vscode/settings.json @@ -0,0 +1,18 @@ +{ + "java.import.gradle.enabled": false, + "java.import.maven.enabled": false, + "java.eclipse.downloadSources": true, + "files.exclude": { + "bin/": true, + ".eclipse/": true, + ".project": true, + ".classpath": true, + "build.gradle": true + }, + "java.completion.importOrder": [ + "", + "javax", + "java", + "#" + ] +} \ No newline at end of file diff --git a/tests/shell/kogito-swf-devmode/RunTests.java b/tests/shell/kogito-swf-devmode/src/RunTests.java similarity index 71% rename from tests/shell/kogito-swf-devmode/RunTests.java rename to tests/shell/kogito-swf-devmode/src/RunTests.java index c3cb89db3..9971e8229 100644 --- a/tests/shell/kogito-swf-devmode/RunTests.java +++ b/tests/shell/kogito-swf-devmode/src/RunTests.java @@ -1,21 +1,20 @@ ///usr/bin/env jbang "$0" "$@" ; exit $? -//DEPS org.slf4j:slf4j-simple:2.0.6 +//DEPS org.slf4j:slf4j-simple:2.0.9 // Junit console to start the test engine: -//DEPS org.junit.platform:junit-platform-console:1.8.2 +//DEPS org.junit.platform:junit-platform-console:1.10.1 // engine to run the tests (tests are written with Junit5): -//DEPS org.junit.jupiter:junit-jupiter-engine:5.8.2 +//DEPS org.junit.jupiter:junit-jupiter-engine:5.10.1 // testcontainers -//DEPS org.testcontainers:testcontainers:1.17.6 -//DEPS org.testcontainers:junit-jupiter:1.17.6 +//DEPS org.testcontainers:testcontainers:1.19.3 +//DEPS org.testcontainers:junit-jupiter:1.19.3 import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; -import java.io.PrintWriter; import java.net.URI; import java.net.URISyntaxException; import java.net.http.HttpClient; @@ -24,18 +23,14 @@ import java.net.http.HttpResponse.BodyHandlers; import java.nio.file.Paths; import java.time.Duration; -import java.util.Collections; - import org.junit.jupiter.api.Test; -import org.junit.platform.console.options.CommandLineOptions; -import org.junit.platform.console.tasks.ConsoleTestExecutor; +import org.junit.platform.console.ConsoleLauncher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testcontainers.containers.BindMode; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.containers.wait.strategy.Wait; -import org.testcontainers.images.builder.ImageFromDockerfile; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -48,16 +43,20 @@ public class RunTests { @Container private GenericContainer devModeImage = new GenericContainer(getTestImage()) - .withFileSystemBind(getScriptDirPath() + "/resources", "/home/kogito/serverless-workflow-project/src/main/resources", BindMode.READ_ONLY) + .withEnv("MAVEN_ARGS_APPEND", "-Ddebug=false -Dquarkus.devservices.enabled=false") + .withFileSystemBind(getScriptDirPath() + "/resources", + "/home/kogito/serverless-workflow-project/src/main/resources", BindMode.READ_ONLY) .withExposedPorts(8080) .waitingFor(Wait.forHttp("/jsongreet")) + .withStartupTimeout(Duration.ofMinutes(2)) .withLogConsumer(logConsumer); @Test public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOException, InterruptedException { devModeImage.start(); HttpRequest request = HttpRequest.newBuilder() - .uri(new URI("http://" + devModeImage.getHost() + ":" + devModeImage.getFirstMappedPort() + "/jsongreet")) + .uri(new URI( + "http://" + devModeImage.getHost() + ":" + devModeImage.getFirstMappedPort() + "/jsongreet")) .header("Content-Type", "application/json") .header("Accept", "application/json") .timeout(Duration.ofSeconds(10)) @@ -69,10 +68,8 @@ public void testBuiltContainerAnswerCorrectly() throws URISyntaxException, IOExc } public static void main(String... args) throws Exception { - CommandLineOptions options = new CommandLineOptions(); - options.setSelectedClasses(Collections.singletonList(RunTests.class.getName())); - options.setReportsDir(Paths.get(getOutputDir())); - new ConsoleTestExecutor(options).execute(new PrintWriter(System.out)); + ConsoleLauncher.main("--select-class=" + RunTests.class.getName(), + "--reports-dir=" + Paths.get(getOutputDir()).toString()); } static String getTestImage() { diff --git a/tests/shell/run.sh b/tests/shell/run.sh index 890543958..8903f84a4 100755 --- a/tests/shell/run.sh +++ b/tests/shell/run.sh @@ -1,4 +1,23 @@ #!/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. +# + set -e script_dir_path="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" @@ -26,7 +45,7 @@ echo "OUTPUT_DIR=${OUTPUT_DIR}" echo "TESTS_SCRIPT_DIR_PATH=${TESTS_SCRIPT_DIR_PATH}" if [ -d "${script_dir_path}/${image_name}" ]; then - curl -Ls https://sh.jbang.dev | bash -s - "${TESTS_SCRIPT_DIR_PATH}/RunTests.java" + curl -Ls https://sh.jbang.dev | bash -s - "${TESTS_SCRIPT_DIR_PATH}/src/RunTests.java" else echo "No shell test to run for image ${image_name}" fi \ No newline at end of file diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh index 4feb39f3e..13e108ae1 100755 --- a/tests/test-apps/clone-repo.sh +++ b/tests/test-apps/clone-repo.sh @@ -1,4 +1,23 @@ #!/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. +# + # # Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes # if image name is supporting services, don't build it @@ -6,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 @@ -20,6 +35,7 @@ fi set -e realPath="realpath" if [[ $OSTYPE == 'darwin'* ]]; then + # If you are on MacOS, use "brew install coreutils" realPath="grealpath" fi base_dir=`dirname $(${realPath} -s $0)` @@ -43,7 +59,7 @@ git clone https://github.com/apache/${KOGITO_EXAMPLES_REPO_NAME}.git ${KOGITO_EX cd ${KOGITO_EXAMPLES_DIR}/ git fetch origin git fetch origin --tags -git checkout -b nightly-main +git switch nightly-main # make a new copy of rules-quarkus-helloworld for native tests cp -rv ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld/ ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld-native/