This is an automated email from the ASF dual-hosted git repository.

ricardozanini pushed a commit to branch main
in repository 
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-images.git


The following commit(s) were added to refs/heads/main by this push:
     new 7becdbf3 Rename quay to docker in image bundles (#1768)
7becdbf3 is described below

commit 7becdbf3937a9a8e9235746ff0014c4f3fd02340
Author: Ricardo Zanini <[email protected]>
AuthorDate: Wed May 22 16:14:33 2024 -0300

    Rename quay to docker in image bundles (#1768)
    
    * Rename quay to docker in image bundles
    
    Signed-off-by: Ricardo Zanini <[email protected]>
    
    * Move kogito-swf dir to sonataflow
    
    Signed-off-by: Ricardo Zanini <[email protected]>
    
    * Rename tests from kogito-swf to sonataflow
    
    Signed-off-by: Ricardo Zanini <[email protected]>
    
    * Rename tests from kogito-swf to sonataflow
    
    Signed-off-by: Ricardo Zanini <[email protected]>
    
    * Adding dockerhub correct URL; renaming ImageStream builder's name
    
    Signed-off-by: Ricardo Zanini <[email protected]>
    
    ---------
    
    Signed-off-by: Ricardo Zanini <[email protected]>
---
 .ci/jenkins/Jenkinsfile.build-image                |  2 +-
 .ci/jenkins/dsl/jobs.groovy                        |  2 +-
 Makefile                                           | 10 ++--
 README.md                                          | 58 +++++++++++-----------
 .../jobs-service/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
 .../tests/bats/sonataflow-builder-build-app.bats}  |  2 +-
 .../bats/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 +-
 tests/features/common-custom-truststore.feature    | 10 ++--
 tests/features/common-dynamic-resources.feature    | 10 ++--
 tests/features/common.feature                      | 14 +++---
 .../data-index/kogito-data-index-common.feature    |  4 +-
 .../data-index/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 +-
 tests/features/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
 .../resources/greet-with-inputschema/Dockerfile    |  2 +-
 .../resources/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
 71 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/.ci/jenkins/Jenkinsfile.build-image 
b/.ci/jenkins/Jenkinsfile.build-image
index fec460ac..4a425f3c 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -204,7 +204,7 @@ pipeline {
                 script {
                     updateGithubCommitStatus('PENDING', 'Tests in progress')
 
-                    String testImageTag = 
"quay.io/kiegroup/${getBuildImageName()}:${getImageVersion()}"
+                    String testImageTag = 
"docker.io/apache/incubator-kie-${getBuildImageName()}:${getImageVersion()}"
                     String builtImageTag = getBuiltImageTag()
                     // Pull and tag to test image
                     sh """
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index bb899371..baf84e3c 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -348,7 +348,7 @@ void setupWeeklyDeployJob(JobType jobType) {
         QUARKUS_PLATFORM_NEXUS_URL: 
Utils.getMavenQuarkusPlatformRepositoryUrl(this),
     ])
 
-    // 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
     jobParams.env.put('IMAGES_LIST', 'kogito-base-builder')
 
     KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
diff --git a/Makefile b/Makefile
index e4a449c2..c41914ce 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 5c2fbb9d..a2eafada 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 
<local_workflow_path>:/home/kogito/serverless-workflow-project/src/main/resources/workflows
 quay.io/kiegroup/kogito-swf-builder:latest
+docker run -it --rm -p 8080:8080 -v 
<local_workflow_path>:/home/kogito/serverless-workflow-project/src/main/resources/workflows
 docker.io/apache/incubator-kie-sonataflow-builder:latest
 ```
 
 Replace `<local_workflow_path>` 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 <Test 
Scenario Name>
+make build-image image_name=sonataflow-builder test_options=--name <Test 
Scenario 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
[email protected]/kiegroup/kogito-data-index-postgresql
[email protected]/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 4f2b8026..e3d1b9c4 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 743c8192..371fd399 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 22eeecb4..bdce50eb 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 048ae5c1..9ba9a817 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 85761440..89fde58b 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 61757a9f..1971fd9b 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 ea7c283d..9b9c6619 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 c9b0b2e8..7d8b0ca5 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 48eaf58f..9d3f357d 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 8d26bb59..e209d625 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 4562b12e..c0f4b068 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 3e68296e..57394e69 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 9ffce5d3..620a2085 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 7404a5c1..63966569 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 ca49e2dc..9a3ef179 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 c661b6a6..6fcb6ddb 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 37f2ed90..e6512954 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -52,7 +52,7 @@ SUPPORTING_SERVICES_IMAGES = {"kogito-data-index-ephemeral",
                               "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 1a3d1615..ce9672b3 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 94d9dc18..de30a744 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -37,8 +37,8 @@ import common
 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 109f8919..ce2ddc45 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 e50c083f..f908ebf4 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -17,11 +17,11 @@
 # under the License.
 #
 
[email protected]/kiegroup/kogito-data-index-ephemeral
[email protected]/kiegroup/kogito-data-index-postgresql
[email protected]/kiegroup/kogito-jit-runner
[email protected]/kiegroup/kogito-jobs-service-ephemeral
[email protected]/kiegroup/kogito-jobs-service-postgresql
[email protected]/apache/incubator-kie-kogito-data-index-ephemeral
[email protected]/apache/incubator-kie-kogito-data-index-postgresql
[email protected]/apache/incubator-kie-kogito-jit-runner
[email protected]/apache/incubator-kie-kogito-jobs-service-ephemeral
[email protected]/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 1eed9e57..d3b9e345 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
[email protected]/kiegroup/kogito-data-index-ephemeral
-#@quay.io/kiegroup/kogito-data-index-postgresql
-#@quay.io/kiegroup/kogito-jit-runner
[email protected]/kiegroup/kogito-jobs-service-ephemeral
-#@quay.io/kiegroup/kogito-jobs-service-postgresql
[email protected]/apache/incubator-kie-kogito-data-index-ephemeral
+#@docker.io/apache/incubator-kie-kogito-data-index-postgresql
+#@docker.io/apache/incubator-kie-kogito-jit-runner
[email protected]/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 49e9e504..0197394c 100644
--- a/tests/features/common.feature
+++ b/tests/features/common.feature
@@ -17,13 +17,13 @@
 # under the License.
 #
 
[email protected]/kiegroup/kogito-data-index-ephemeral
[email protected]/kiegroup/kogito-data-index-postgresql
[email protected]/kiegroup/kogito-jit-runner
[email protected]/kiegroup/kogito-jobs-service-ephemeral
[email protected]/kiegroup/kogito-jobs-service-postgresql
[email protected]/kiegroup/kogito-swf-builder
[email protected]/kiegroup/kogito-base-builder
[email protected]/apache/incubator-kie-kogito-data-index-ephemeral
[email protected]/apache/incubator-kie-kogito-data-index-postgresql
[email protected]/apache/incubator-kie-kogito-jit-runner
[email protected]/apache/incubator-kie-kogito-jobs-service-ephemeral
[email protected]/apache/incubator-kie-kogito-jobs-service-postgresql
[email protected]/apache/incubator-kie-sonataflow-builder
[email protected]/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 5ae57d3f..dedb8ddb 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.
 #
 
[email protected]/kiegroup/kogito-data-index-ephemeral
[email protected]/kiegroup/kogito-data-index-postgresql
[email protected]/apache/incubator-kie-kogito-data-index-ephemeral
[email protected]/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 79438451..b37b7931 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.
 #
 
[email protected]/kiegroup/kogito-data-index-ephemeral
[email protected]/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 e8b643d0..ced19dc7 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.
 #
 
[email protected]/kiegroup/kogito-data-index-postgresql
[email protected]/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 bd3c5490..8d897bdf 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.
 #
 
[email protected]/kiegroup/kogito-jobs-service-allinone
[email protected]/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 fa2f7212..d7ec38d2 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.
 #
 
[email protected]/kiegroup/kogito-jobs-service-ephemeral
[email protected]/kiegroup/kogito-jobs-service-postgresql
[email protected]/kiegroup/kogito-jobs-service-allinone
[email protected]/apache/incubator-kie-kogito-jobs-service-ephemeral
[email protected]/apache/incubator-kie-kogito-jobs-service-postgresql
[email protected]/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 9a86f1d3..bb0102bc 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.
 #
 
[email protected]/kiegroup/kogito-jobs-service-ephemeral
[email protected]/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 e946bda3..4c601a9d 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.
 #
 
[email protected]/kiegroup/kogito-jobs-service-postgresql
[email protected]/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 f24bb33c..a4146f52 100644
--- a/tests/features/kogito-common-postresql-services.feature
+++ b/tests/features/kogito-common-postresql-services.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
[email protected]/kiegroup/kogito-data-index-postgresql
[email protected]/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 98875e2f..4c6e51ae 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
[email protected]/kiegroup/kogito-jit-runner
[email protected]/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 3de371f3..2fe570b5 100644
--- a/tests/features/kogito-swf-builder.feature
+++ b/tests/features/kogito-swf-builder.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
[email protected]/kiegroup/kogito-swf-builder
[email protected]/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 16a016de..2474f53a 100644
--- a/tests/features/kogito-swf-common.feature
+++ b/tests/features/kogito-swf-common.feature
@@ -17,8 +17,8 @@
 # under the License.
 #
 
[email protected]/kiegroup/kogito-swf-builder
[email protected]/kiegroup/kogito-swf-devmode
[email protected]/apache/incubator-kie-sonataflow-builder
[email protected]/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 8bb40087..d008dab0 100644
--- a/tests/features/kogito-swf-devmode.feature
+++ b/tests/features/kogito-swf-devmode.feature
@@ -17,7 +17,7 @@
 # under the License.
 #
 
[email protected]/kiegroup/kogito-swf-devmode
[email protected]/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 bcec895e..568fda55 100644
--- a/tests/features/supporting-services-common.feature
+++ b/tests/features/supporting-services-common.feature
@@ -17,9 +17,9 @@
 # under the License.
 #
 
[email protected]/kiegroup/kogito-data-index-ephemeral
[email protected]/kiegroup/kogito-data-index-postgresql
[email protected]/kiegroup/kogito-jit-runner
[email protected]/apache/incubator-kie-kogito-data-index-ephemeral
[email protected]/apache/incubator-kie-kogito-data-index-postgresql
[email protected]/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 3e5f6908..571e1abb 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 6279486d..da41c621 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 6279486d..da41c621 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


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to