From f623c318487eafee2a50ad8aa008435278d37ba1 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Mon, 10 Jun 2024 14:08:15 +0200 Subject: [PATCH 1/5] Temporary removal of kogito-swf-{builder-,devmode} images from all Jenkins jobs (#1762) # Conflicts: # .ci/jenkins/Jenkinsfile.deploy # .ci/jenkins/dsl/jobs.groovy --- kogito-swf-builder-image.yaml | 74 ------------------------------ kogito-swf-devmode-image.yaml | 85 ----------------------------------- scripts/common.py | 3 +- 3 files changed, 2 insertions(+), 160 deletions(-) delete mode 100644 kogito-swf-builder-image.yaml delete mode 100644 kogito-swf-devmode-image.yaml diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml deleted file mode 100644 index 59cad93c6..000000000 --- a/kogito-swf-builder-image.yaml +++ /dev/null @@ -1,74 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - - name: builder - from: "registry.access.redhat.com/ubi8/openjdk-17:1.19" - version: "999-SNAPSHOT" - modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.maven.common - - name: org.kie.kogito.project.versions - - name: org.kie.kogito.swf.common.scripts - - name: org.kie.kogito.swf.builder.build-config - - name: org.kie.kogito.swf.common.build - - - name: "quay.io/kiegroup/kogito-swf-builder" - from: "registry.access.redhat.com/ubi8/openjdk-17:1.19" - version: "999-SNAPSHOT" - description: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled" - - labels: - - name: "io.openshift.s2i.scripts-url" - value: "image:///usr/local/s2i" - - name: "io.openshift.s2i.destination" - value: "/tmp" - - name: "io.quarkus.platform.version" - value: "3.2.10.Final" - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled." - - name: "io.k8s.display-name" - value: "Kogito SWF Builder" - - name: "io.openshift.tags" - value: "kogito,builder,serverless,workflow" - - modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.maven.common - - name: org.kie.kogito.project.versions - - name: org.kie.kogito.swf.common.scripts - - name: org.kie.kogito.swf.builder.runtime.community - - run: - workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}" - user: 1001 diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml deleted file mode 100644 index 18e918c8e..000000000 --- a/kogito-swf-devmode-image.yaml +++ /dev/null @@ -1,85 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - - name: builder - from: "registry.access.redhat.com/ubi8/openjdk-17:1.19" - version: "999-SNAPSHOT" - modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.maven.common - - name: org.kie.kogito.project.versions - - name: org.kie.kogito.swf.common.scripts - - name: org.kie.kogito.swf.devmode.build-config - - name: org.kie.kogito.swf.common.build - - packages: - manager: microdnf - - - name: "quay.io/kiegroup/kogito-swf-devmode" - from: "registry.access.redhat.com/ubi8/openjdk-17:1.19" - version: "999-SNAPSHOT" - description: "Kogito Serverless Workflow development mode with Quarkus extensions libraries preinstalled" - - labels: - - name: "io.quarkus.platform.version" - value: "3.2.10.Final" - - name: "org.kie.kogito.version" - value: "999-SNAPSHOT" - - name: "maintainer" - value: "Apache KIE " - - name: "io.k8s.description" - value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled." - - name: "io.k8s.display-name" - value: "Kogito SWF Builder" - - name: "io.openshift.tags" - value: "kogito,development,serverless,workflow" - - name: "io.openshift.expose-services" - value: "8080:http,5005:http" - - packages: - manager: microdnf - - modules: - repositories: - - path: modules - install: - - name: org.kie.kogito.system.user - - name: org.kie.kogito.logging - - name: org.kie.kogito.launch.scripts - - name: org.kie.kogito.dynamic.resources - - name: org.kie.kogito.maven.common - - name: org.kie.kogito.project.versions - - name: org.kie.kogito.swf.common.scripts - - name: org.kie.kogito.swf.devmode.runtime.common - - name: org.kie.kogito.swf.devmode.runtime.community - - ports: - - value: 8080 - - value: 5005 - - run: - workdir: "/home/kogito/${PROJECT_ARTIFACT_ID}" - user: 1001 - cmd: - - "/home/kogito/launch/run-app-devmode.sh" diff --git a/scripts/common.py b/scripts/common.py index 9ccdeccc3..37f2ed902 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -52,7 +52,8 @@ "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone", } -SWF_BUILDER_IMAGES = {"kogito-swf-builder", "kogito-swf-devmode", "kogito-base-builder"} +# Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release +SWF_BUILDER_IMAGES = {"kogito-base-builder"} def yaml_loader(): From 00c005366702abbe0e3a55742c7b45633bdcedab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= Date: Thu, 9 May 2024 17:52:25 +0200 Subject: [PATCH 2/5] [kie-issues@1167] Add license headers to files (#1763) --- .github/bot-files/comments.yml | 19 ++++++++++++++++++ .github/bot-files/labels.yml | 20 ++++++++++++++++++- .github/bot-files/reviewers.yml | 20 ++++++++++++++++++- .github/pull_request_template.md | 19 ++++++++++++++++++ .github/workflows/jenkins-tests-PR.yml | 19 ++++++++++++++++++ .github/workflows/kogito-images-pr-check.yml | 19 ++++++++++++++++++ .github/workflows/pr-backporting.yml | 19 ++++++++++++++++++ Makefile | 19 ++++++++++++++++++ README.md | 19 ++++++++++++++++++ RELEASE_NOTES.md | 18 +++++++++++++++++ contrib/jobs-service/sql/init.sql | 19 ++++++++++++++++++ modules/kogito-custom-truststore/README.md | 19 ++++++++++++++++++ .../kogito-maven/common/maven/settings.xml | 19 ++++++++++++++++++ scripts/README.md | 19 ++++++++++++++++++ .../features/common-custom-truststore.feature | 19 ++++++++++++++++++ .../features/common-dynamic-resources.feature | 19 ++++++++++++++++++ tests/features/common.feature | 19 ++++++++++++++++++ .../kogito-data-index-common.feature | 19 ++++++++++++++++++ .../kogito-data-index-ephemeral.feature | 19 ++++++++++++++++++ .../kogito-data-index-postgresql.feature | 19 ++++++++++++++++++ .../kogito-jobs-service-all-in-one.feature | 19 ++++++++++++++++++ .../kogito-jobs-service-common.feature | 19 ++++++++++++++++++ .../kogito-jobs-service-ephemeral.feature | 19 ++++++++++++++++++ .../kogito-jobs-service-postgresql.feature | 19 ++++++++++++++++++ .../kogito-common-postresql-services.feature | 19 ++++++++++++++++++ tests/features/kogito-jit-runner.feature | 19 ++++++++++++++++++ tests/features/kogito-swf-builder.feature | 19 ++++++++++++++++++ tests/features/kogito-swf-common.feature | 19 ++++++++++++++++++ tests/features/kogito-swf-devmode.feature | 19 ++++++++++++++++++ .../supporting-services-common.feature | 19 ++++++++++++++++++ tests/shell/README.md | 19 ++++++++++++++++++ .../greet-with-inputschema/Dockerfile | 19 ++++++++++++++++++ .../resources/greet/Dockerfile | 19 ++++++++++++++++++ .../kogito-swf-devmode/src/RunTests.java | 17 ++++++++++++++++ tests/test-apps/application.properties | 19 ++++++++++++++++++ 35 files changed, 662 insertions(+), 2 deletions(-) diff --git a/.github/bot-files/comments.yml b/.github/bot-files/comments.yml index f2dd55c2d..8bee795c9 100644 --- a/.github/bot-files/comments.yml +++ b/.github/bot-files/comments.yml @@ -1,3 +1,22 @@ +# +# 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. +# + prFirstTimeContributor: Welcome to the Kogito Community!. Please make sure you've read the [contributors' guide](README.md#contributing-to-kogito-images-repository) prCiTrigger: /jenkins test diff --git a/.github/bot-files/labels.yml b/.github/bot-files/labels.yml index 23e3e6384..490564355 100644 --- a/.github/bot-files/labels.yml +++ b/.github/bot-files/labels.yml @@ -1,5 +1,23 @@ +# +# 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. +# + # we don't need path labels here but the bot expects atleast one row inside it. -# This compulsion will be removed after https://issues.redhat.com/browse/KOGITO-3026 labels: - paths: diff --git a/.github/bot-files/reviewers.yml b/.github/bot-files/reviewers.yml index 60ddc278d..02670968e 100644 --- a/.github/bot-files/reviewers.yml +++ b/.github/bot-files/reviewers.yml @@ -1,5 +1,23 @@ +# +# 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. +# + # we don't need path reviewers here but the bot expects atleast one row inside it. -# This compulsion will be removed after https://issues.redhat.com/browse/KOGITO-3026 review: - paths: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d03a30e15..72277e817 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,3 +1,22 @@ + + Many thanks for submitting your Pull Request :heart:! Please make sure your PR meets the following requirements: diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml index bf3815cbc..d93868706 100644 --- a/.github/workflows/jenkins-tests-PR.yml +++ b/.github/workflows/jenkins-tests-PR.yml @@ -1,3 +1,22 @@ +# +# 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 workflow will build a Java project with Maven # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven name: Jenkins Tests diff --git a/.github/workflows/kogito-images-pr-check.yml b/.github/workflows/kogito-images-pr-check.yml index 31331b404..a309c7c61 100644 --- a/.github/workflows/kogito-images-pr-check.yml +++ b/.github/workflows/kogito-images-pr-check.yml @@ -1,3 +1,22 @@ +# +# 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: Images PR check on: pull_request diff --git a/.github/workflows/pr-backporting.yml b/.github/workflows/pr-backporting.yml index ae52e051d..899e108d3 100644 --- a/.github/workflows/pr-backporting.yml +++ b/.github/workflows/pr-backporting.yml @@ -1,3 +1,22 @@ +# +# 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: Pull Request Backporting on: diff --git a/Makefile b/Makefile index 21a496597..e4a449c2e 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,22 @@ +# +# 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_VERSION := $(shell python scripts/retrieve_version.py) SHORTENED_LATEST_VERSION := $(shell echo $(IMAGE_VERSION) | awk -F. '{print $$1"."$$2}') KOGITO_APPS_TARGET_BRANCH ?= main diff --git a/README.md b/README.md index 0543ac631..5c2fbb9dd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,22 @@ + + Kogito ------ diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 42c9735b6..72f7c80fc 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,21 @@ + ## Enhancements diff --git a/contrib/jobs-service/sql/init.sql b/contrib/jobs-service/sql/init.sql index ee1a94650..1d27d5aff 100644 --- a/contrib/jobs-service/sql/init.sql +++ b/contrib/jobs-service/sql/init.sql @@ -1,3 +1,22 @@ +-- +-- 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. +-- + CREATE ROLE "kogito-user" WITH LOGIN SUPERUSER diff --git a/modules/kogito-custom-truststore/README.md b/modules/kogito-custom-truststore/README.md index bdb7c0bff..e213a4a98 100644 --- a/modules/kogito-custom-truststore/README.md +++ b/modules/kogito-custom-truststore/README.md @@ -1,3 +1,22 @@ + + # Kogito Custom TrustStore Module This module adds the possibility to override the default Java TrustStore in the JVM process for any Kogito Service. diff --git a/modules/kogito-maven/common/maven/settings.xml b/modules/kogito-maven/common/maven/settings.xml index 233a6a6b7..be7ff0e49 100644 --- a/modules/kogito-maven/common/maven/settings.xml +++ b/modules/kogito-maven/common/maven/settings.xml @@ -1,3 +1,22 @@ + + + ### Kogito helper scripts On this directory you can find some python scripts used to help with some repetitive tasks. diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature index 55b2ffa98..e50c083f9 100644 --- a/tests/features/common-custom-truststore.feature +++ b/tests/features/common-custom-truststore.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-data-index-ephemeral @quay.io/kiegroup/kogito-data-index-postgresql @quay.io/kiegroup/kogito-jit-runner diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature index b08a26599..1eed9e575 100644 --- a/tests/features/common-dynamic-resources.feature +++ b/tests/features/common-dynamic-resources.feature @@ -1,3 +1,22 @@ +# +# 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. +# + # Run only on images that won't die instantly # See https://github.com/apache/incubator-kie-kogito-images/issues/1722 @quay.io/kiegroup/kogito-data-index-ephemeral diff --git a/tests/features/common.feature b/tests/features/common.feature index c3188be36..49e9e5040 100644 --- a/tests/features/common.feature +++ b/tests/features/common.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-data-index-ephemeral @quay.io/kiegroup/kogito-data-index-postgresql @quay.io/kiegroup/kogito-jit-runner diff --git a/tests/features/data-index/kogito-data-index-common.feature b/tests/features/data-index/kogito-data-index-common.feature index a4de284fb..5ae57d3fe 100644 --- a/tests/features/data-index/kogito-data-index-common.feature +++ b/tests/features/data-index/kogito-data-index-common.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-data-index-ephemeral @quay.io/kiegroup/kogito-data-index-postgresql Feature: Kogito-data-index common feature. diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature index f50066570..794384512 100644 --- a/tests/features/data-index/kogito-data-index-ephemeral.feature +++ b/tests/features/data-index/kogito-data-index-ephemeral.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-data-index-ephemeral Feature: Kogito-data-index ephemeral postgresql feature. diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature index 2d3a1da77..e8b643d02 100644 --- a/tests/features/data-index/kogito-data-index-postgresql.feature +++ b/tests/features/data-index/kogito-data-index-postgresql.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-data-index-postgresql Feature: Kogito-data-index postgresql feature. 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 395415190..bd3c5490b 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 @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-jobs-service-allinone Feature: Kogito-jobs-service-all-in-one feature. diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature index 34e21b0a3..fa2f7212b 100644 --- a/tests/features/jobs-service/kogito-jobs-service-common.feature +++ b/tests/features/jobs-service/kogito-jobs-service-common.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @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-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature index a6658a4b9..9a86f1d30 100644 --- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature +++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-jobs-service-ephemeral Feature: Kogito-jobs-service-ephemeral feature. diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature index 2b89a2807..e946bda32 100644 --- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature +++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-jobs-service-postgresql Feature: Kogito-jobs-service-postgresql feature. diff --git a/tests/features/kogito-common-postresql-services.feature b/tests/features/kogito-common-postresql-services.feature index cf77b26fd..f24bb33c3 100644 --- a/tests/features/kogito-common-postresql-services.feature +++ b/tests/features/kogito-common-postresql-services.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-data-index-postgresql Feature: Kogito-data-index postgresql feature. diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature index bb5b21e4d..98875e2f2 100644 --- a/tests/features/kogito-jit-runner.feature +++ b/tests/features/kogito-jit-runner.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-jit-runner Feature: Kogito-jit-runner feature. diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature index acae47c9c..3de371f33 100644 --- a/tests/features/kogito-swf-builder.feature +++ b/tests/features/kogito-swf-builder.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-swf-builder Feature: Serverless Workflow builder images diff --git a/tests/features/kogito-swf-common.feature b/tests/features/kogito-swf-common.feature index 9f0c54e89..16a016de1 100644 --- a/tests/features/kogito-swf-common.feature +++ b/tests/features/kogito-swf-common.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-swf-builder @quay.io/kiegroup/kogito-swf-devmode Feature: Serverless Workflow images common diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature index c17ff1f9e..8bb40087a 100644 --- a/tests/features/kogito-swf-devmode.feature +++ b/tests/features/kogito-swf-devmode.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-swf-devmode Feature: Serverless Workflow devmode images diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature index b2a39ec30..bcec895e8 100644 --- a/tests/features/supporting-services-common.feature +++ b/tests/features/supporting-services-common.feature @@ -1,3 +1,22 @@ +# +# 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. +# + @quay.io/kiegroup/kogito-data-index-ephemeral @quay.io/kiegroup/kogito-data-index-postgresql @quay.io/kiegroup/kogito-jit-runner diff --git a/tests/shell/README.md b/tests/shell/README.md index 687dc4d2f..3e5f69080 100644 --- a/tests/shell/README.md +++ b/tests/shell/README.md @@ -1,3 +1,22 @@ + + # Tests in Shell ## Running Tests With JBang 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 2172c7129..6279486d4 100644 --- a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile +++ b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile @@ -1,3 +1,22 @@ +# +# 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. +# + ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0" FROM ${BUILDER_IMAGE_TAG} AS builder diff --git a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile index 2172c7129..6279486d4 100644 --- a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile +++ b/tests/shell/kogito-swf-builder/resources/greet/Dockerfile @@ -1,3 +1,22 @@ +# +# 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. +# + ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0" FROM ${BUILDER_IMAGE_TAG} AS builder diff --git a/tests/shell/kogito-swf-devmode/src/RunTests.java b/tests/shell/kogito-swf-devmode/src/RunTests.java index 9971e8229..893c445df 100644 --- a/tests/shell/kogito-swf-devmode/src/RunTests.java +++ b/tests/shell/kogito-swf-devmode/src/RunTests.java @@ -1,5 +1,22 @@ ///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: diff --git a/tests/test-apps/application.properties b/tests/test-apps/application.properties index 893b32bf1..399172ead 100644 --- a/tests/test-apps/application.properties +++ b/tests/test-apps/application.properties @@ -1 +1,20 @@ +# +# 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. +# + quarkus.http.port=10000 \ No newline at end of file From 5004b5ab03a12eb17b497db0ddbfdeed878b3268 Mon Sep 17 00:00:00 2001 From: Jason Porter Date: Thu, 9 May 2024 12:32:41 -0600 Subject: [PATCH 3/5] Adding required DISCLAIMER file (#1765) INCUBATOR projects are required to have a DISCLAIMER file for their releases. Signed-off-by: Jason Porter --- DISCLAIMER | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 DISCLAIMER diff --git a/DISCLAIMER b/DISCLAIMER new file mode 100644 index 000000000..a07e390bd --- /dev/null +++ b/DISCLAIMER @@ -0,0 +1,23 @@ +Apache KIE (incubating) is an effort undergoing incubation at The Apache Software +Foundation (ASF), sponsored by the name of Apache Incubator. Incubation is +required of all newly accepted projects until a further review indicates that +the infrastructure, communications, and decision making process have stabilized +in a manner consistent with other successful ASF projects. While incubation +status is not necessarily a reflection of the completeness or stability of the +code, it does indicate that the project has yet to be fully endorsed by the ASF. + +Some of the incubating project’s releases may not be fully compliant with ASF +policy. For example, releases may have incomplete or un-reviewed licensing +conditions. What follows is a list of known issues the project is currently +aware of (note that this list, by definition, is likely to be incomplete): + +* Hibernate, an LGPL project, is being used. Hibernate is in the process of + relicensing to ASL v2 +* Some files, particularly test files, and those not supporting comments, may + be missing the ASF Licensing Header + +If you are planning to incorporate this work into your product/project, please +be aware that you will need to conduct a thorough licensing review to determine +the overall implications of including this work. For the current status of this +project through the Apache Incubator visit: +https://incubator.apache.org/projects/kie.html From 791a95d8ecd3ea57d3fa58ccce1bd2aaa476dff7 Mon Sep 17 00:00:00 2001 From: Alex Porcelli Date: Thu, 9 May 2024 20:34:16 +0200 Subject: [PATCH 4/5] kie-issues#1167 Missing Apache headers for xsd file. (#1764) --- .gitignore | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitignore b/.gitignore index 4c20af005..028be8b7c 100755 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,19 @@ +# 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. /target /local target/ From dec66df442f3264a7c443df6496fc17ac8551bd8 Mon Sep 17 00:00:00 2001 From: Roberto Oliveira Date: Mon, 10 Jun 2024 14:10:17 +0200 Subject: [PATCH 5/5] Rename quay to docker in image bundles (#1768) * Rename quay to docker in image bundles Signed-off-by: Ricardo Zanini * Move kogito-swf dir to sonataflow Signed-off-by: Ricardo Zanini * Rename tests from kogito-swf to sonataflow Signed-off-by: Ricardo Zanini * Rename tests from kogito-swf to sonataflow Signed-off-by: Ricardo Zanini * Adding dockerhub correct URL; renaming ImageStream builder's name Signed-off-by: Ricardo Zanini --------- Signed-off-by: Ricardo Zanini # Conflicts: # .ci/jenkins/dsl/jobs.groovy --- Makefile | 10 ++-- README.md | 58 +++++++++---------- .../container-compose-postgresql.yaml | 2 +- kogito-base-builder-image.yaml | 2 +- kogito-data-index-ephemeral-image.yaml | 2 +- kogito-data-index-postgresql-image.yaml | 2 +- kogito-imagestream.yaml | 18 +++--- kogito-jit-runner-image.yaml | 2 +- kogito-jobs-service-allinone-image.yaml | 2 +- kogito-jobs-service-ephemeral-image.yaml | 2 +- kogito-jobs-service-postgresql-image.yaml | 2 +- .../builder/build-config/module.yaml | 0 .../builder/runtime/community/configure.sh | 4 +- .../builder/runtime/community/module.yaml | 4 +- .../common/build/added/cleanup_project.sh | 0 .../common/build/added/zip_files.sh | 8 +-- .../common/build/configure.sh | 0 .../common/build/module.yaml | 0 .../common/scripts/added/add-extension.sh | 0 .../common/scripts/added/build-app.sh | 0 .../common/scripts/added/configure-jvm-mvn.sh | 0 .../common/scripts/added/create-app.sh | 0 .../common/scripts/added/jvm-settings.sh | 0 .../common/scripts/configure.sh | 0 .../common/scripts/module.yaml | 0 .../bats/sonataflow-builder-build-app.bats} | 2 +- .../sonataflow-builder-jvm-settings.bats} | 0 .../devmode/build-config/module.yaml | 0 .../runtime/common/added/run-app-devmode.sh | 0 .../devmode/runtime/common/configure.sh | 0 .../devmode/runtime/common/module.yaml | 0 .../devmode/runtime/community/configure.sh | 4 +- .../devmode/runtime/community/module.yaml | 4 +- scripts/README.md | 2 +- scripts/common.py | 2 +- scripts/push-local-registry.sh | 2 +- scripts/push-staging.py | 4 +- scripts/run-bats.sh | 4 +- .../features/common-custom-truststore.feature | 10 ++-- .../features/common-dynamic-resources.feature | 10 ++-- tests/features/common.feature | 14 ++--- .../kogito-data-index-common.feature | 4 +- .../kogito-data-index-ephemeral.feature | 2 +- .../kogito-data-index-postgresql.feature | 2 +- .../kogito-jobs-service-all-in-one.feature | 2 +- .../kogito-jobs-service-common.feature | 6 +- .../kogito-jobs-service-ephemeral.feature | 2 +- .../kogito-jobs-service-postgresql.feature | 2 +- .../kogito-common-postresql-services.feature | 2 +- tests/features/kogito-jit-runner.feature | 2 +- tests/features/kogito-swf-builder.feature | 2 +- tests/features/kogito-swf-common.feature | 4 +- tests/features/kogito-swf-devmode.feature | 2 +- .../supporting-services-common.feature | 6 +- tests/shell/README.md | 4 +- .../.vscode/launch.json | 0 .../.vscode/settings.json | 0 .../greet-with-inputschema/.mvn/jvm.config | 0 .../greet-with-inputschema/Dockerfile | 2 +- .../greet-with-inputschema/greet.sw.json | 0 .../greet-with-inputschema/schemas/input.json | 0 .../resources/greet/.mvn/jvm.config | 0 .../resources/greet/Dockerfile | 2 +- .../resources/greet/greet.sw.json | 0 .../src/RunTests.java | 0 .../.vscode/launch.json | 0 .../.vscode/settings.json | 0 .../resources/greet.sw.json | 0 .../src/RunTests.java | 0 69 files changed, 111 insertions(+), 111 deletions(-) rename modules/{kogito-swf => sonataflow}/builder/build-config/module.yaml (100%) rename modules/{kogito-swf => sonataflow}/builder/runtime/community/configure.sh (89%) rename modules/{kogito-swf => sonataflow}/builder/runtime/community/module.yaml (89%) rename modules/{kogito-swf => sonataflow}/common/build/added/cleanup_project.sh (100%) rename modules/{kogito-swf => sonataflow}/common/build/added/zip_files.sh (83%) rename modules/{kogito-swf => sonataflow}/common/build/configure.sh (100%) rename modules/{kogito-swf => sonataflow}/common/build/module.yaml (100%) rename modules/{kogito-swf => sonataflow}/common/scripts/added/add-extension.sh (100%) rename modules/{kogito-swf => sonataflow}/common/scripts/added/build-app.sh (100%) rename modules/{kogito-swf => sonataflow}/common/scripts/added/configure-jvm-mvn.sh (100%) rename modules/{kogito-swf => sonataflow}/common/scripts/added/create-app.sh (100%) rename modules/{kogito-swf => sonataflow}/common/scripts/added/jvm-settings.sh (100%) rename modules/{kogito-swf => sonataflow}/common/scripts/configure.sh (100%) rename modules/{kogito-swf => sonataflow}/common/scripts/module.yaml (100%) rename modules/{kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats => sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats} (93%) rename modules/{kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats => sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats} (100%) rename modules/{kogito-swf => sonataflow}/devmode/build-config/module.yaml (100%) rename modules/{kogito-swf => sonataflow}/devmode/runtime/common/added/run-app-devmode.sh (100%) rename modules/{kogito-swf => sonataflow}/devmode/runtime/common/configure.sh (100%) rename modules/{kogito-swf => sonataflow}/devmode/runtime/common/module.yaml (100%) rename modules/{kogito-swf => sonataflow}/devmode/runtime/community/configure.sh (90%) rename modules/{kogito-swf => sonataflow}/devmode/runtime/community/module.yaml (94%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/.vscode/launch.json (100%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/.vscode/settings.json (100%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet-with-inputschema/.mvn/jvm.config (100%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet-with-inputschema/Dockerfile (96%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet-with-inputschema/greet.sw.json (100%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet-with-inputschema/schemas/input.json (100%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet/.mvn/jvm.config (100%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet/Dockerfile (96%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/resources/greet/greet.sw.json (100%) rename tests/shell/{kogito-swf-builder => sonataflow-builder}/src/RunTests.java (100%) rename tests/shell/{kogito-swf-devmode => sonataflow-devmode}/.vscode/launch.json (100%) rename tests/shell/{kogito-swf-devmode => sonataflow-devmode}/.vscode/settings.json (100%) rename tests/shell/{kogito-swf-devmode => sonataflow-devmode}/resources/greet.sw.json (100%) rename tests/shell/{kogito-swf-devmode => sonataflow-devmode}/src/RunTests.java (100%) diff --git a/Makefile b/Makefile index e4a449c2e..c41914ce8 100644 --- a/Makefile +++ b/Makefile @@ -65,13 +65,13 @@ endif # tag with shortened version ifneq ($(ignore_tag),true) ifneq ($(findstring rc,$(IMAGE_VERSION)),rc) - ${BUILD_ENGINE} tag quay.io/kiegroup/${image_name}:${IMAGE_VERSION} quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION} + ${BUILD_ENGINE} tag docker.io/apache/incubator-kie-${image_name}:${IMAGE_VERSION} docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION} endif endif # if ignore_test is set to true, ignore the tests ifneq ($(ignore_test),true) ${CEKIT_CMD} --descriptor ${image_name}-image.yaml test behave ${test_options} - tests/shell/run.sh ${image_name} "quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION}" + tests/shell/run.sh ${image_name} "docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION}" endif @@ -85,11 +85,11 @@ _push: .PHONY: push-image image_name= push-image: - ${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:${IMAGE_VERSION} - ${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:latest + ${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:${IMAGE_VERSION} + ${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:latest ifneq ($(findstring rc,$(IMAGE_VERSION)), rc) @echo "${SHORTENED_LATEST_VERSION} will be pushed" - ${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push quay.io/kiegroup/${image_name}:${SHORTENED_LATEST_VERSION} + ${BUILD_ENGINE} ${BUILD_ENGINE_TLS_OPTIONS} push docker.io/apache/incubator-kie-${image_name}:${SHORTENED_LATEST_VERSION} endif diff --git a/README.md b/README.md index 5c2fbb9dd..a2eafada4 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ The main purpose of this image is to be used within the Kogito Serverless Operat an example on how to use it: ```bash -FROM quay.io/kiegroup/kogito-swf-builder:latest AS builder +FROM docker.io/apache/incubator-kie-sonataflow-builder:latest AS builder # Copy all files from current directory to the builder context COPY * ./resources/ @@ -143,7 +143,7 @@ If you run the image, it will start an empty [Kogito Serverless Workflow](https: To run the image for testing your local workflow files, run: ```shell -docker run -it --rm -p 8080:8080 -v :/home/kogito/serverless-workflow-project/src/main/resources/workflows quay.io/kiegroup/kogito-swf-builder:latest +docker run -it --rm -p 8080:8080 -v :/home/kogito/serverless-workflow-project/src/main/resources/workflows docker.io/apache/incubator-kie-sonataflow-builder:latest ``` Replace `` with your local filesystem containing your workflow files. You can test with the [example application](https://kiegroup.github.io/kogito-docs/serverlessworkflow/latest/getting-started/create-your-first-workflow-service.html#proc-creating-workflow). @@ -166,12 +166,12 @@ The Kogito Component Images can be considered as lightweight images that will co by providing extra capabilities, like managing the processes on a web UI or providing persistence layer to the Kogito applications. Today we have the following Kogito Component Images: -* [quay.io/kiegroup/kogito-data-index-ephemeral](https://quay.io/kiegroup/kogito-data-index-ephemeral) -* [quay.io/kiegroup/kogito-data-index-postgresql](https://quay.io/kiegroup/kogito-data-index-postgresql) -* [quay.io/kiegroup/kogito-jobs-service-ephemeral](https://quay.io/kiegroup/kogito-jobs-service-ephemeral) -* [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-jit-runner](https://quay.io/kiegroup/kogito-jit-runner) +* [docker.io/apache/incubator-kie-kogito-data-index-ephemeral](https://hub.docker.com/r/apache/incubator-kie-kogito-data-index-ephemeral) +* [docker.io/apache/incubator-kie-kogito-data-index-postgresql](https://hub.docker.com/r/apache/incubator-kie-kogito-data-index-postgresql) +* [docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-ephemeral) +* [docker.io/apache/incubator-kie-kogito-jobs-service-postgresql](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-postgresql) +* [docker.io/apache/incubator-kie-kogito-jobs-service-allinone](https://hub.docker.com/r/apache/incubator-kie-kogito-jobs-service-allinone) +* [docker.io/apache/incubator-kie-kogito-jit-runner](https://hub.docker.com/r/apache/incubator-kie-kogito-jit-runner) ### Kogito Data Index Component Images @@ -181,14 +181,14 @@ For more information please visit this (link)(https://docs.jboss.org/kogito/rele The Data Index Service depends on a PostgreSQL instance. The Persistence service can be switched by using its corresponding image -- Ephemeral PostgreSQL: quay.io/kiegroup/kogito-data-index-ephemeral +- Ephemeral PostgreSQL: docker.io/apache/incubator-kie-kogito-data-index-ephemeral [image.yaml](kogito-data-index-ephemeral-image.yaml) -- PostgreSQL: quay.io/kiegroup/kogito-data-index-postgresql +- PostgreSQL: docker.io/apache/incubator-kie-kogito-data-index-postgresql [image.yaml](kogito-data-index-postgresql-image.yaml) Basic usage with Ephemeral PostgreSQL: ```bash -$ docker run -it quay.io/kiegroup/kogito-data-index-ephemeral:latest +$ docker run -it docker.io/apache/incubator-kie-kogito-data-index-ephemeral:latest ``` Basic usage with PostgreSQL: @@ -196,13 +196,13 @@ Basic usage with PostgreSQL: $ 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-data-index-postgresql:latest + docker.io/apache/incubator-kie-kogito-data-index-postgresql:latest ``` To enable debug just use this env while running this image: ```bash -$ docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-data-index-postgresql:latest +$ docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-data-index-postgresql:latest ``` You should notice a few debug messages present in the system output. @@ -226,13 +226,13 @@ Today, the Jobs service contains four images: Basic usage: ```bash -$ docker run -it quay.io/kiegroup/kogito-jobs-service-ephemeral:latest +$ docker run -it docker.io/apache/incubator-kie-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-postgresql:latest +docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:latest ``` You should notice a few debug messages being printed in the system output. @@ -258,13 +258,13 @@ using either environment variables or system properties. Using environment variables: ```bash -podman run -it -e VARIABLE_NAME=value quay.io/kiegroup/kogito-jobs-service-allinone:latest +podman run -it -e VARIABLE_NAME=value docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest ``` Using system properties: ```bash podman run -it -e JAVA_OPTIONS='-Dmy.sys.prop1=value1 -Dmy.sys.prop2=value2' \ - quay.io/kiegroup/kogito-jobs-service-allinone:latest + docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest ``` For convenience there are `container-compose` files that can be used to start the Jobs Service with the desired @@ -286,13 +286,13 @@ The Kogito JIT Runner provides a tool that allows you to submit a DMN model and Basic usage: ```bash -$ docker run -it quay.io/kiegroup/kogito-jit-runner:latest +$ docker run -it docker.io/apache/incubator-kie-kogito-jit-runner:latest ``` To enable debug just use this env while running this image: ```bash -docker run -it --env SCRIPT_DEBUG=true quay.io/kiegroup/kogito-jit-runner:latest +docker run -it --env SCRIPT_DEBUG=true docker.io/apache/incubator-kie-kogito-jit-runner:latest ``` You should notice a few debug messages being printed in the system output. You can then visit `localhost:8080/index.html` to test the service. @@ -399,12 +399,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-ephemeral](kogito-data-index-ephemeral-image.yaml) -- [quay.io/kiegroup/kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml) -- [quay.io/kiegroup/kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-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-jit-runner](kogito-jit-runner-image.yaml) +- [docker.io/apache/incubator-kie-kogito-data-index-ephemeral](kogito-data-index-ephemeral-image.yaml) +- [docker.io/apache/incubator-kie-kogito-data-index-postgresql](kogito-data-index-postgresql-image.yaml) +- [docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral](kogito-jobs-service-ephemeral-image.yaml) +- [docker.io/apache/incubator-kie-kogito-jobs-service-postgresql](kogito-jobs-service-postgresql-image.yaml) +- [docker.io/apache/incubator-kie-kogito-jobs-service-allinone](kogito-jobs-service-allinone-image.yaml) +- [docker.io/apache/incubator-kie-kogito-jit-runner](kogito-jit-runner-image.yaml) ### Testing Images @@ -428,12 +428,12 @@ See [Writing Behave Tests](#writing-behave-tests). Example: ```bash -make build-image image_name=kogito-swf-builder test_options=--wip +make build-image image_name=sonataflow-builder test_options=--wip ``` Or by name: ```bash -make build-image image_name=kogito-swf-builder test_options=--name +make build-image image_name=sonataflow-builder test_options=--name ``` You can also add `cekit_option` to the make command, which will be appended to the Cekit command. Default is `cekit -v`. @@ -497,12 +497,12 @@ this can be easily done by adding the **@wip** tag on the behave test that you a All images have already test feature files. If a new image is being created, a new feature file will need to be created and the very first line of this file would need to contain a tag with the image name. -For example, if we are creating a new image called quay.io/kiegroup/kogito-moon-service, we would have a feature called +For example, if we are creating a new image called docker.io/apache/incubator-kie-kogito-moon-service, we would have a feature called **kogito-moon-service.feature** under the **tests/features** directory and this file will look like with the following example: ```text -@quay.io/kiegroup/kogito-data-index-postgresql +@docker.io/apache/incubator-kie-kogito-data-index-postgresql Feature: Kogito-data-index-postgresql feature. ... Scenarios...... diff --git a/contrib/jobs-service/container-compose-postgresql.yaml b/contrib/jobs-service/container-compose-postgresql.yaml index 4f2b8026f..e3d1b9c44 100644 --- a/contrib/jobs-service/container-compose-postgresql.yaml +++ b/contrib/jobs-service/container-compose-postgresql.yaml @@ -34,7 +34,7 @@ services: - POSTGRES_PASSWORD=postgres jobs-service-all-in-one: - image: quay.io/kiegroup/kogito-jobs-service-allinone:latest + image: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:latest container_name: jobs-service ports: - "8080:8080" diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml index 743c81924..371fd399a 100644 --- a/kogito-base-builder-image.yaml +++ b/kogito-base-builder-image.yaml @@ -18,7 +18,7 @@ # schema_version: 1 -name: "quay.io/kiegroup/kogito-base-builder" +name: "docker.io/apache/incubator-kie-kogito-base-builder" version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/openjdk-17:1.19" description: "Image with JDK and Maven, used as a base image. It is used by Web Tools !" diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml index 22eeecb49..bdce50eb7 100644 --- a/kogito-data-index-ephemeral-image.yaml +++ b/kogito-data-index-ephemeral-image.yaml @@ -18,7 +18,7 @@ # schema_version: 1 -name: "quay.io/kiegroup/kogito-data-index-ephemeral" +name: "docker.io/apache/incubator-kie-kogito-data-index-ephemeral" version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19" description: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider" diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml index 048ae5c15..9ba9a817f 100644 --- a/kogito-data-index-postgresql-image.yaml +++ b/kogito-data-index-postgresql-image.yaml @@ -18,7 +18,7 @@ # schema_version: 1 -name: "quay.io/kiegroup/kogito-data-index-postgresql" +name: "docker.io/apache/incubator-kie-kogito-data-index-postgresql" version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19" description: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider" diff --git a/kogito-imagestream.yaml b/kogito-imagestream.yaml index 857614409..89fde58bf 100644 --- a/kogito-imagestream.yaml +++ b/kogito-imagestream.yaml @@ -27,7 +27,7 @@ items: - kind: ImageStream apiVersion: v1 metadata: - name: kogito-swf-builder + name: kie-sonataflow-builder annotations: openshift.io/display-name: Kogito Serverless Workflow builder with basic Quarkus SWF extensions preinstalled openshift.io/provider-display-name: KIE Group. @@ -44,7 +44,7 @@ items: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-swf-builder:999-SNAPSHOT + name: docker.io/apache/incubator-kie-sonataflow-builder:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -65,7 +65,7 @@ items: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-base-builder:999-SNAPSHOT + name: docker.io/apache/incubator-kie-kogito-base-builder:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -86,7 +86,7 @@ items: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-data-index-ephemeral:999-SNAPSHOT + name: docker.io/apache/incubator-kie-kogito-data-index-ephemeral:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -107,7 +107,7 @@ items: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-data-index-postgresql:999-SNAPSHOT + name: docker.io/apache/incubator-kie-kogito-data-index-postgresql:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -128,7 +128,7 @@ items: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-jit-runner:999-SNAPSHOT + name: docker.io/apache/incubator-kie-kogito-jit-runner:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -149,7 +149,7 @@ items: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-ephemeral:999-SNAPSHOT + name: docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -170,7 +170,7 @@ items: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-postgresql:999-SNAPSHOT + name: docker.io/apache/incubator-kie-kogito-jobs-service-postgresql:999-SNAPSHOT - kind: ImageStream apiVersion: v1 metadata: @@ -191,4 +191,4 @@ items: type: Local from: kind: DockerImage - name: quay.io/kiegroup/kogito-jobs-service-allinone:999-SNAPSHOT + name: docker.io/apache/incubator-kie-kogito-jobs-service-allinone:999-SNAPSHOT diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml index 61757a9f4..1971fd9b5 100644 --- a/kogito-jit-runner-image.yaml +++ b/kogito-jit-runner-image.yaml @@ -18,7 +18,7 @@ # schema_version: 1 -name: "quay.io/kiegroup/kogito-jit-runner" +name: "docker.io/apache/incubator-kie-kogito-jit-runner" version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19" description: "Runtime image for Kogito JIT Runner" diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml index ea7c283d9..9b9c6619a 100644 --- a/kogito-jobs-service-allinone-image.yaml +++ b/kogito-jobs-service-allinone-image.yaml @@ -18,7 +18,7 @@ # schema_version: 1 -name: "quay.io/kiegroup/kogito-jobs-service-allinone" +name: "docker.io/apache/incubator-kie-kogito-jobs-service-allinone" version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19" description: "Runtime image for Kogito Jobs Service with all available jdbc providers" diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml index c9b0b2e83..7d8b0ca50 100644 --- a/kogito-jobs-service-ephemeral-image.yaml +++ b/kogito-jobs-service-ephemeral-image.yaml @@ -18,7 +18,7 @@ # schema_version: 1 -name: "quay.io/kiegroup/kogito-jobs-service-ephemeral" +name: "docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral" version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19" description: "Runtime image for Kogito in memory Jobs Service" diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml index 48eaf58f0..9d3f357d3 100644 --- a/kogito-jobs-service-postgresql-image.yaml +++ b/kogito-jobs-service-postgresql-image.yaml @@ -18,7 +18,7 @@ # schema_version: 1 -name: "quay.io/kiegroup/kogito-jobs-service-postgresql" +name: "docker.io/apache/incubator-kie-kogito-jobs-service-postgresql" version: "999-SNAPSHOT" from: "registry.access.redhat.com/ubi8/openjdk-17-runtime:1.19" description: "Runtime image for Kogito Jobs Service based on Postgresql" diff --git a/modules/kogito-swf/builder/build-config/module.yaml b/modules/sonataflow/builder/build-config/module.yaml similarity index 100% rename from modules/kogito-swf/builder/build-config/module.yaml rename to modules/sonataflow/builder/build-config/module.yaml diff --git a/modules/kogito-swf/builder/runtime/community/configure.sh b/modules/sonataflow/builder/runtime/community/configure.sh similarity index 89% rename from modules/kogito-swf/builder/runtime/community/configure.sh rename to modules/sonataflow/builder/runtime/community/configure.sh index 8d26bb594..e209d625f 100644 --- a/modules/kogito-swf/builder/runtime/community/configure.sh +++ b/modules/sonataflow/builder/runtime/community/configure.sh @@ -26,8 +26,8 @@ mkdir -p "${KOGITO_HOME}"/.m2/repository mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}" # Unzip Quarkus app and Maven repository -tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}" -tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository +tar xf "${SOURCES_DIR}"/sonataflow-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}" +tar xf "${SOURCES_DIR}"/sonataflow-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository chown -R 1001:0 "${KOGITO_HOME}" chmod -R ug+rwX "${KOGITO_HOME}" diff --git a/modules/kogito-swf/builder/runtime/community/module.yaml b/modules/sonataflow/builder/runtime/community/module.yaml similarity index 89% rename from modules/kogito-swf/builder/runtime/community/module.yaml rename to modules/sonataflow/builder/runtime/community/module.yaml index 4562b12ed..c0f4b0688 100644 --- a/modules/kogito-swf/builder/runtime/community/module.yaml +++ b/modules/sonataflow/builder/runtime/community/module.yaml @@ -23,9 +23,9 @@ description: "Kogito Serverless Workflow builder runtime module" artifacts: - image: builder - path: /home/kogito/build_output/kogito-swf-quarkus-app.tar + path: /home/kogito/build_output/sonataflow-quarkus-app.tar - image: builder - path: /home/kogito/build_output/kogito-swf-maven-repo.tar + path: /home/kogito/build_output/sonataflow-maven-repo.tar execute: - script: configure.sh diff --git a/modules/kogito-swf/common/build/added/cleanup_project.sh b/modules/sonataflow/common/build/added/cleanup_project.sh similarity index 100% rename from modules/kogito-swf/common/build/added/cleanup_project.sh rename to modules/sonataflow/common/build/added/cleanup_project.sh diff --git a/modules/kogito-swf/common/build/added/zip_files.sh b/modules/sonataflow/common/build/added/zip_files.sh similarity index 83% rename from modules/kogito-swf/common/build/added/zip_files.sh rename to modules/sonataflow/common/build/added/zip_files.sh index 3e68296ef..57394e692 100755 --- a/modules/kogito-swf/common/build/added/zip_files.sh +++ b/modules/sonataflow/common/build/added/zip_files.sh @@ -25,10 +25,10 @@ BUILD_OUTPUT="${KOGITO_HOME}"/build_output/ mkdir -p "${BUILD_OUTPUT}" echo "Zip and copy scaffold project" -tar cf kogito-swf-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" . -cp -v kogito-swf-quarkus-app.tar "${BUILD_OUTPUT}" +tar cf sonataflow-quarkus-app.tar -C "${PROJECT_ARTIFACT_ID}" . +cp -v sonataflow-quarkus-app.tar "${BUILD_OUTPUT}" echo "Zip and copy maven repo" cd "${KOGITO_HOME}"/.m2/repository/ -tar cf kogito-swf-maven-repo.tar . -cp -v kogito-swf-maven-repo.tar "${BUILD_OUTPUT}" \ No newline at end of file +tar cf sonataflow-maven-repo.tar . +cp -v sonataflow-maven-repo.tar "${BUILD_OUTPUT}" \ No newline at end of file diff --git a/modules/kogito-swf/common/build/configure.sh b/modules/sonataflow/common/build/configure.sh similarity index 100% rename from modules/kogito-swf/common/build/configure.sh rename to modules/sonataflow/common/build/configure.sh diff --git a/modules/kogito-swf/common/build/module.yaml b/modules/sonataflow/common/build/module.yaml similarity index 100% rename from modules/kogito-swf/common/build/module.yaml rename to modules/sonataflow/common/build/module.yaml diff --git a/modules/kogito-swf/common/scripts/added/add-extension.sh b/modules/sonataflow/common/scripts/added/add-extension.sh similarity index 100% rename from modules/kogito-swf/common/scripts/added/add-extension.sh rename to modules/sonataflow/common/scripts/added/add-extension.sh diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/sonataflow/common/scripts/added/build-app.sh similarity index 100% rename from modules/kogito-swf/common/scripts/added/build-app.sh rename to modules/sonataflow/common/scripts/added/build-app.sh diff --git a/modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh b/modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh similarity index 100% rename from modules/kogito-swf/common/scripts/added/configure-jvm-mvn.sh rename to modules/sonataflow/common/scripts/added/configure-jvm-mvn.sh diff --git a/modules/kogito-swf/common/scripts/added/create-app.sh b/modules/sonataflow/common/scripts/added/create-app.sh similarity index 100% rename from modules/kogito-swf/common/scripts/added/create-app.sh rename to modules/sonataflow/common/scripts/added/create-app.sh diff --git a/modules/kogito-swf/common/scripts/added/jvm-settings.sh b/modules/sonataflow/common/scripts/added/jvm-settings.sh similarity index 100% rename from modules/kogito-swf/common/scripts/added/jvm-settings.sh rename to modules/sonataflow/common/scripts/added/jvm-settings.sh diff --git a/modules/kogito-swf/common/scripts/configure.sh b/modules/sonataflow/common/scripts/configure.sh similarity index 100% rename from modules/kogito-swf/common/scripts/configure.sh rename to modules/sonataflow/common/scripts/configure.sh diff --git a/modules/kogito-swf/common/scripts/module.yaml b/modules/sonataflow/common/scripts/module.yaml similarity index 100% rename from modules/kogito-swf/common/scripts/module.yaml rename to modules/sonataflow/common/scripts/module.yaml diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats b/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats similarity index 93% rename from modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats rename to modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats index 9ffce5d37..620a20851 100644 --- a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats +++ b/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-build-app.bats @@ -35,7 +35,7 @@ teardown() { @test "verify copy resources is working" { TEMPD=$(mktemp -d) - cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/kogito-swf-builder/resources/greet-with-inputschema/* ${TEMPD} + cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/sonataflow-builder/resources/greet-with-inputschema/* ${TEMPD} # We don't care about the errors to try to execute and build the program, just the copy matters source ${KOGITO_HOME}/launch/build-app.sh ${TEMPD} || true diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats b/modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats similarity index 100% rename from modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-jvm-settings.bats rename to modules/sonataflow/common/scripts/tests/bats/sonataflow-builder-jvm-settings.bats diff --git a/modules/kogito-swf/devmode/build-config/module.yaml b/modules/sonataflow/devmode/build-config/module.yaml similarity index 100% rename from modules/kogito-swf/devmode/build-config/module.yaml rename to modules/sonataflow/devmode/build-config/module.yaml diff --git a/modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh b/modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh similarity index 100% rename from modules/kogito-swf/devmode/runtime/common/added/run-app-devmode.sh rename to modules/sonataflow/devmode/runtime/common/added/run-app-devmode.sh diff --git a/modules/kogito-swf/devmode/runtime/common/configure.sh b/modules/sonataflow/devmode/runtime/common/configure.sh similarity index 100% rename from modules/kogito-swf/devmode/runtime/common/configure.sh rename to modules/sonataflow/devmode/runtime/common/configure.sh diff --git a/modules/kogito-swf/devmode/runtime/common/module.yaml b/modules/sonataflow/devmode/runtime/common/module.yaml similarity index 100% rename from modules/kogito-swf/devmode/runtime/common/module.yaml rename to modules/sonataflow/devmode/runtime/common/module.yaml diff --git a/modules/kogito-swf/devmode/runtime/community/configure.sh b/modules/sonataflow/devmode/runtime/community/configure.sh similarity index 90% rename from modules/kogito-swf/devmode/runtime/community/configure.sh rename to modules/sonataflow/devmode/runtime/community/configure.sh index 7404a5c1e..63966569e 100644 --- a/modules/kogito-swf/devmode/runtime/community/configure.sh +++ b/modules/sonataflow/devmode/runtime/community/configure.sh @@ -27,8 +27,8 @@ mkdir -p "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}" mkdir -p "${KOGITO_HOME}"/.m2/repository # Unzip Quarkus app and Maven repository -tar xf "${SOURCES_DIR}"/kogito-swf-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}" -tar xf "${SOURCES_DIR}"/kogito-swf-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository +tar xf "${SOURCES_DIR}"/sonataflow-quarkus-app.tar -C "${KOGITO_HOME}/${PROJECT_ARTIFACT_ID}" +tar xf "${SOURCES_DIR}"/sonataflow-maven-repo.tar -C "${KOGITO_HOME}"/.m2/repository chown -R 1001:0 "${KOGITO_HOME}" chmod -R ug+rwX "${KOGITO_HOME}" diff --git a/modules/kogito-swf/devmode/runtime/community/module.yaml b/modules/sonataflow/devmode/runtime/community/module.yaml similarity index 94% rename from modules/kogito-swf/devmode/runtime/community/module.yaml rename to modules/sonataflow/devmode/runtime/community/module.yaml index ca49e2dca..9a3ef179d 100644 --- a/modules/kogito-swf/devmode/runtime/community/module.yaml +++ b/modules/sonataflow/devmode/runtime/community/module.yaml @@ -43,9 +43,9 @@ envs: artifacts: - image: builder - path: /home/kogito/build_output/kogito-swf-quarkus-app.tar + path: /home/kogito/build_output/sonataflow-quarkus-app.tar - image: builder - path: /home/kogito/build_output/kogito-swf-maven-repo.tar + path: /home/kogito/build_output/sonataflow-maven-repo.tar execute: - script: configure.sh diff --git a/scripts/README.md b/scripts/README.md index c661b6a6d..6fcb6ddbe 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -91,7 +91,7 @@ This script will help you while building images and test in a local OpenShift Cl images built in your local registry with the tag following the patter: X.Z, e.g. 0.10: ```text -quay.io/kiegroup/kogito-jobs-service-ephemeral:0.10 +docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral:0.10 ``` The [Makefile](../Makefile) has an option to do it, it can be invoked as the following sample: diff --git a/scripts/common.py b/scripts/common.py index 37f2ed902..e65129542 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -52,7 +52,7 @@ "kogito-jobs-service-postgresql", "kogito-jobs-service-allinone", } -# Temporary removal of kogito-swf-* images that have been moved to kie-tools for the Apache 10 release +# Temporary removal of sonataflow-* images that have been moved to kie-tools for the Apache 10 release SWF_BUILDER_IMAGES = {"kogito-base-builder"} diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh index 1a3d1615d..ce9672b33 100644 --- a/scripts/push-local-registry.sh +++ b/scripts/push-local-registry.sh @@ -42,7 +42,7 @@ echo "Images version ${version} will be pushed to registry ${registry}" while read image; do echo "tagging image ${image} to ${registry}/${namespace}/${image}:${version}" - ${BUILD_ENGINE} tag quay.io/kiegroup/${image}:${version} ${registry}/${namespace}/${image}:${version} + ${BUILD_ENGINE} tag docker.io/apache/incubator-kie-${image}:${version} ${registry}/${namespace}/${image}:${version} echo "Deleting imagestream ${image} if exists `oc delete oc -n ${namespace} ${image}`" ${BUILD_ENGINE} push ${registry}/${namespace}/${image}:${version} done <<<$(python scripts/list-images.py) diff --git a/scripts/push-staging.py b/scripts/push-staging.py index 94d9dc184..de30a7441 100644 --- a/scripts/push-staging.py +++ b/scripts/push-staging.py @@ -37,8 +37,8 @@ import argparse IMAGES_NEXT_RC_TAG = [] -QUAY_KOGITO_ORG_PLACE_HOLDER = "quay.io/kiegroup/{}:{}" -QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG = "quay.io/kiegroup/{}" +QUAY_KOGITO_ORG_PLACE_HOLDER = "docker.io/apache/incubator-kie-{}:{}" +QUAY_KOGITO_ORG_PLACE_HOLDER_NO_TAG = "docker.io/apache/incubator-kie-{}" def find_next_tag(override_tags): diff --git a/scripts/run-bats.sh b/scripts/run-bats.sh index 109f8919c..ce2ddc45d 100755 --- a/scripts/run-bats.sh +++ b/scripts/run-bats.sh @@ -32,5 +32,5 @@ fi echo "----> running bats on kogito-jobs-service-common" ./bats/bin/bats modules/kogito-jobs-service-common/tests/bats -echo "----> running bats on kogito-swf-builder" -./bats/bin/bats modules/kogito-swf/common/scripts/tests/bats +echo "----> running bats on sonataflow-builder" +./bats/bin/bats modules/sonataflow/common/scripts/tests/bats diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature index e50c083f9..f908ebf4e 100644 --- a/tests/features/common-custom-truststore.feature +++ b/tests/features/common-custom-truststore.feature @@ -17,11 +17,11 @@ # under the License. # -@quay.io/kiegroup/kogito-data-index-ephemeral -@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-postgresql +@docker.io/apache/incubator-kie-kogito-data-index-ephemeral +@docker.io/apache/incubator-kie-kogito-data-index-postgresql +@docker.io/apache/incubator-kie-kogito-jit-runner +@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral +@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql Feature: Common tests for Custom TrustStore configuration # This test sets an invalid certificate to the container, it fails to start, and if timing is bad cekit hangs on 'Running command ps -C java in container' # See https://github.com/apache/incubator-kie-kogito-images/issues/1722 diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature index 1eed9e575..d3b9e3458 100644 --- a/tests/features/common-dynamic-resources.feature +++ b/tests/features/common-dynamic-resources.feature @@ -19,11 +19,11 @@ # Run only on images that won't die instantly # See https://github.com/apache/incubator-kie-kogito-images/issues/1722 -@quay.io/kiegroup/kogito-data-index-ephemeral -#@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-postgresql +@docker.io/apache/incubator-kie-kogito-data-index-ephemeral +#@docker.io/apache/incubator-kie-kogito-data-index-postgresql +#@docker.io/apache/incubator-kie-kogito-jit-runner +@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral +#@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql 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 49e9e5040..0197394c2 100644 --- a/tests/features/common.feature +++ b/tests/features/common.feature @@ -17,13 +17,13 @@ # under the License. # -@quay.io/kiegroup/kogito-data-index-ephemeral -@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-postgresql -@quay.io/kiegroup/kogito-swf-builder -@quay.io/kiegroup/kogito-base-builder +@docker.io/apache/incubator-kie-kogito-data-index-ephemeral +@docker.io/apache/incubator-kie-kogito-data-index-postgresql +@docker.io/apache/incubator-kie-kogito-jit-runner +@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral +@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql +@docker.io/apache/incubator-kie-sonataflow-builder +@docker.io/apache/incubator-kie-kogito-base-builder 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 5ae57d3fe..dedb8ddbb 100644 --- a/tests/features/data-index/kogito-data-index-common.feature +++ b/tests/features/data-index/kogito-data-index-common.feature @@ -17,8 +17,8 @@ # under the License. # -@quay.io/kiegroup/kogito-data-index-ephemeral -@quay.io/kiegroup/kogito-data-index-postgresql +@docker.io/apache/incubator-kie-kogito-data-index-ephemeral +@docker.io/apache/incubator-kie-kogito-data-index-postgresql 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 794384512..b37b79310 100644 --- a/tests/features/data-index/kogito-data-index-ephemeral.feature +++ b/tests/features/data-index/kogito-data-index-ephemeral.feature @@ -17,7 +17,7 @@ # under the License. # -@quay.io/kiegroup/kogito-data-index-ephemeral +@docker.io/apache/incubator-kie-kogito-data-index-ephemeral Feature: Kogito-data-index ephemeral postgresql feature. Scenario: verify if all labels are correctly set on kogito-data-index-ephemeral image diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature index e8b643d02..ced19dc79 100644 --- a/tests/features/data-index/kogito-data-index-postgresql.feature +++ b/tests/features/data-index/kogito-data-index-postgresql.feature @@ -17,7 +17,7 @@ # under the License. # -@quay.io/kiegroup/kogito-data-index-postgresql +@docker.io/apache/incubator-kie-kogito-data-index-postgresql Feature: Kogito-data-index postgresql feature. Scenario: verify if all labels are correctly set on kogito-data-index-postgresql image 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 bd3c5490b..8d897bdf3 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 @@ -17,7 +17,7 @@ # under the License. # -@quay.io/kiegroup/kogito-jobs-service-allinone +@docker.io/apache/incubator-kie-kogito-jobs-service-allinone Feature: Kogito-jobs-service-all-in-one feature. Scenario: verify if all labels are correctly set kogito-jobs-service image image diff --git a/tests/features/jobs-service/kogito-jobs-service-common.feature b/tests/features/jobs-service/kogito-jobs-service-common.feature index fa2f7212b..d7ec38d23 100644 --- a/tests/features/jobs-service/kogito-jobs-service-common.feature +++ b/tests/features/jobs-service/kogito-jobs-service-common.feature @@ -17,9 +17,9 @@ # under the License. # -@quay.io/kiegroup/kogito-jobs-service-ephemeral -@quay.io/kiegroup/kogito-jobs-service-postgresql -@quay.io/kiegroup/kogito-jobs-service-allinone +@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral +@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql +@docker.io/apache/incubator-kie-kogito-jobs-service-allinone Feature: Kogito-jobs-service common feature. Scenario: verify if the events is correctly enabled diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature index 9a86f1d30..bb0102bc0 100644 --- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature +++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature @@ -17,7 +17,7 @@ # under the License. # -@quay.io/kiegroup/kogito-jobs-service-ephemeral +@docker.io/apache/incubator-kie-kogito-jobs-service-ephemeral Feature: Kogito-jobs-service-ephemeral feature. Scenario: verify if all labels are correctly set kogito-jobs-service image image diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature index e946bda32..4c601a9d3 100644 --- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature +++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature @@ -17,7 +17,7 @@ # under the License. # -@quay.io/kiegroup/kogito-jobs-service-postgresql +@docker.io/apache/incubator-kie-kogito-jobs-service-postgresql Feature: Kogito-jobs-service-postgresql feature. Scenario: verify if all labels are correctly set kogito-jobs-service image image diff --git a/tests/features/kogito-common-postresql-services.feature b/tests/features/kogito-common-postresql-services.feature index f24bb33c3..a4146f52b 100644 --- a/tests/features/kogito-common-postresql-services.feature +++ b/tests/features/kogito-common-postresql-services.feature @@ -17,7 +17,7 @@ # under the License. # -@quay.io/kiegroup/kogito-data-index-postgresql +@docker.io/apache/incubator-kie-kogito-data-index-postgresql Feature: Kogito-data-index postgresql feature. Scenario: verify if of container is correctly started with postgresql parameters diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature index 98875e2f2..4c6e51aed 100644 --- a/tests/features/kogito-jit-runner.feature +++ b/tests/features/kogito-jit-runner.feature @@ -17,7 +17,7 @@ # under the License. # -@quay.io/kiegroup/kogito-jit-runner +@docker.io/apache/incubator-kie-kogito-jit-runner Feature: Kogito-jit-runner feature. Scenario: verify if all labels are correctly set on kogito-jit-runner image diff --git a/tests/features/kogito-swf-builder.feature b/tests/features/kogito-swf-builder.feature index 3de371f33..2fe570b55 100644 --- a/tests/features/kogito-swf-builder.feature +++ b/tests/features/kogito-swf-builder.feature @@ -17,7 +17,7 @@ # under the License. # -@quay.io/kiegroup/kogito-swf-builder +@docker.io/apache/incubator-kie-sonataflow-builder 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 16a016de1..2474f53a7 100644 --- a/tests/features/kogito-swf-common.feature +++ b/tests/features/kogito-swf-common.feature @@ -17,8 +17,8 @@ # under the License. # -@quay.io/kiegroup/kogito-swf-builder -@quay.io/kiegroup/kogito-swf-devmode +@docker.io/apache/incubator-kie-sonataflow-builder +@docker.io/apache/incubator-kie-sonataflow-devmode Feature: Serverless Workflow images common Scenario: Verify if the swf and quarkus files are under /home/kogito/.m2/repository diff --git a/tests/features/kogito-swf-devmode.feature b/tests/features/kogito-swf-devmode.feature index 8bb40087a..d008dab00 100644 --- a/tests/features/kogito-swf-devmode.feature +++ b/tests/features/kogito-swf-devmode.feature @@ -17,7 +17,7 @@ # under the License. # -@quay.io/kiegroup/kogito-swf-devmode +@docker.io/apache/incubator-kie-sonataflow-devmode Feature: Serverless Workflow devmode images Scenario: Verify if container starts in devmode by default diff --git a/tests/features/supporting-services-common.feature b/tests/features/supporting-services-common.feature index bcec895e8..568fda55b 100644 --- a/tests/features/supporting-services-common.feature +++ b/tests/features/supporting-services-common.feature @@ -17,9 +17,9 @@ # under the License. # -@quay.io/kiegroup/kogito-data-index-ephemeral -@quay.io/kiegroup/kogito-data-index-postgresql -@quay.io/kiegroup/kogito-jit-runner +@docker.io/apache/incubator-kie-kogito-data-index-ephemeral +@docker.io/apache/incubator-kie-kogito-data-index-postgresql +@docker.io/apache/incubator-kie-kogito-jit-runner Feature: kogito supporting services common feature Scenario: Verify if the application jar exists diff --git a/tests/shell/README.md b/tests/shell/README.md index 3e5f69080..571e1abb3 100644 --- a/tests/shell/README.md +++ b/tests/shell/README.md @@ -25,12 +25,12 @@ - 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. +You can then edit the files in `sonataflow-builder` and `sonataflow-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 +tests/shell/run.sh sonataflow-devmode docker.io/apache/incubator-kie-sonataflow-devmode:999-SNAPSHOT ``` The first argument is the test case to run and the second, the image. diff --git a/tests/shell/kogito-swf-builder/.vscode/launch.json b/tests/shell/sonataflow-builder/.vscode/launch.json similarity index 100% rename from tests/shell/kogito-swf-builder/.vscode/launch.json rename to tests/shell/sonataflow-builder/.vscode/launch.json diff --git a/tests/shell/kogito-swf-builder/.vscode/settings.json b/tests/shell/sonataflow-builder/.vscode/settings.json similarity index 100% rename from tests/shell/kogito-swf-builder/.vscode/settings.json rename to tests/shell/sonataflow-builder/.vscode/settings.json diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/.mvn/jvm.config b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/.mvn/jvm.config similarity index 100% rename from tests/shell/kogito-swf-builder/resources/greet-with-inputschema/.mvn/jvm.config rename to tests/shell/sonataflow-builder/resources/greet-with-inputschema/.mvn/jvm.config diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile similarity index 96% rename from tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile rename to tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile index 6279486d4..da41c621f 100644 --- a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile +++ b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0" +ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:2.0" FROM ${BUILDER_IMAGE_TAG} AS builder diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/greet.sw.json b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json similarity index 100% rename from tests/shell/kogito-swf-builder/resources/greet-with-inputschema/greet.sw.json rename to tests/shell/sonataflow-builder/resources/greet-with-inputschema/greet.sw.json diff --git a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/schemas/input.json b/tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json similarity index 100% rename from tests/shell/kogito-swf-builder/resources/greet-with-inputschema/schemas/input.json rename to tests/shell/sonataflow-builder/resources/greet-with-inputschema/schemas/input.json diff --git a/tests/shell/kogito-swf-builder/resources/greet/.mvn/jvm.config b/tests/shell/sonataflow-builder/resources/greet/.mvn/jvm.config similarity index 100% rename from tests/shell/kogito-swf-builder/resources/greet/.mvn/jvm.config rename to tests/shell/sonataflow-builder/resources/greet/.mvn/jvm.config diff --git a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile b/tests/shell/sonataflow-builder/resources/greet/Dockerfile similarity index 96% rename from tests/shell/kogito-swf-builder/resources/greet/Dockerfile rename to tests/shell/sonataflow-builder/resources/greet/Dockerfile index 6279486d4..da41c621f 100644 --- a/tests/shell/kogito-swf-builder/resources/greet/Dockerfile +++ b/tests/shell/sonataflow-builder/resources/greet/Dockerfile @@ -17,7 +17,7 @@ # under the License. # -ARG BUILDER_IMAGE_TAG="quay.io/kiegroup/kogito-swf-builder:2.0" +ARG BUILDER_IMAGE_TAG="docker.io/apache/incubator-kie-sonataflow-builder:2.0" FROM ${BUILDER_IMAGE_TAG} AS builder diff --git a/tests/shell/kogito-swf-builder/resources/greet/greet.sw.json b/tests/shell/sonataflow-builder/resources/greet/greet.sw.json similarity index 100% rename from tests/shell/kogito-swf-builder/resources/greet/greet.sw.json rename to tests/shell/sonataflow-builder/resources/greet/greet.sw.json diff --git a/tests/shell/kogito-swf-builder/src/RunTests.java b/tests/shell/sonataflow-builder/src/RunTests.java similarity index 100% rename from tests/shell/kogito-swf-builder/src/RunTests.java rename to tests/shell/sonataflow-builder/src/RunTests.java diff --git a/tests/shell/kogito-swf-devmode/.vscode/launch.json b/tests/shell/sonataflow-devmode/.vscode/launch.json similarity index 100% rename from tests/shell/kogito-swf-devmode/.vscode/launch.json rename to tests/shell/sonataflow-devmode/.vscode/launch.json diff --git a/tests/shell/kogito-swf-devmode/.vscode/settings.json b/tests/shell/sonataflow-devmode/.vscode/settings.json similarity index 100% rename from tests/shell/kogito-swf-devmode/.vscode/settings.json rename to tests/shell/sonataflow-devmode/.vscode/settings.json diff --git a/tests/shell/kogito-swf-devmode/resources/greet.sw.json b/tests/shell/sonataflow-devmode/resources/greet.sw.json similarity index 100% rename from tests/shell/kogito-swf-devmode/resources/greet.sw.json rename to tests/shell/sonataflow-devmode/resources/greet.sw.json diff --git a/tests/shell/kogito-swf-devmode/src/RunTests.java b/tests/shell/sonataflow-devmode/src/RunTests.java similarity index 100% rename from tests/shell/kogito-swf-devmode/src/RunTests.java rename to tests/shell/sonataflow-devmode/src/RunTests.java