This is an automated email from the ASF dual-hosted git repository. ricardozanini pushed a commit to branch radtriste-fix-pipelines in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-images.git
commit f8c825e345a5cb4ce9c5fdc3fdd0828bc2b83987 Author: jstastny-cz <[email protected]> AuthorDate: Fri Nov 10 11:39:48 2023 +0100 adjust repository URLs after transfer --- .ci/jenkins/Jenkinsfile.build-image | 8 ++-- .github/workflows/jenkins-tests-PR.yml | 2 +- .github/workflows/pr-backporting.yml | 4 +- Makefile | 2 +- README.md | 60 ++++++++++++------------ scripts/build-kogito-apps-components.sh | 6 +-- scripts/common.py | 2 +- tests/features/kogito-common-builder-jvm.feature | 24 +++++----- tests/features/kogito-s2i-builder-native.feature | 10 ++-- tests/features/kogito-s2i-builder.feature | 4 +- tests/test-apps/clone-repo.sh | 2 +- 11 files changed, 61 insertions(+), 63 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image index 676843c4..9c5aae68 100644 --- a/.ci/jenkins/Jenkinsfile.build-image +++ b/.ci/jenkins/Jenkinsfile.build-image @@ -2,8 +2,6 @@ QUAY_REGISTRY = 'quay.io' -def localRegistryUrl = ''; - pipeline { agent { docker { @@ -98,8 +96,8 @@ pipeline { updateGithubCommitStatus('PENDING', 'Build in progress') int freePort = cloud.findFreePort() - localRegistryUrl = cloud.startLocalRegistry(freePort) - cloud.prepareForDockerMultiplatformBuild([localRegistryUrl],[cloud.getDockerIOMirrorRegistryConfig()], false) + env.localRegistryUrl = cloud.startLocalRegistry(freePort) + cloud.prepareForDockerMultiplatformBuild([env.localRegistryUrl],[cloud.getDockerIOMirrorRegistryConfig()], false) // Generate the Dockerfile runPythonCommand("make build-image ${getMakeBuildImageArgs()} image_name=${getBuildImageName()} ignore_test=true ignore_tag=true build_options='--dry-run'") @@ -226,7 +224,7 @@ String getBuiltImageTag(String imageTag = '') { if (shouldDeployImage()) { return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName()}:${imageTag ?: getDeployImageTag()}" } else { - return "${localRegistryUrl}/${getBuildImageName()}:${githubscm.getCommitHash()}" + return "${env.localRegistryUrl}/${getBuildImageName()}:${githubscm.getCommitHash()}" } } diff --git a/.github/workflows/jenkins-tests-PR.yml b/.github/workflows/jenkins-tests-PR.yml index 324a2deb..d9bb4083 100644 --- a/.github/workflows/jenkins-tests-PR.yml +++ b/.github/workflows/jenkins-tests-PR.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: DSL tests - uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main + uses: apache/incubator-kie-kogito-pipelines/.ci/actions/dsl-tests@main with: main-config-file-repo: apache/incubator-kie-kogito-pipelines main-config-file-path: .ci/jenkins/config/main.yaml diff --git a/.github/workflows/pr-backporting.yml b/.github/workflows/pr-backporting.yml index ae52e051..e7005245 100644 --- a/.github/workflows/pr-backporting.yml +++ b/.github/workflows/pr-backporting.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Set target branches id: set-targets - uses: kiegroup/kie-ci/.ci/actions/parse-labels@main + uses: apache/incubator-kie-kogito-pipelines/.ci/actions/parse-labels@main with: labels: ${LABELS} @@ -34,7 +34,7 @@ jobs: REVIEWERS: ${{ toJSON(github.event.pull_request.requested_reviewers) }} steps: - name: Backporting - uses: kiegroup/kie-ci/.ci/actions/backporting@main + uses: apache/incubator-kie-kogito-pipelines/.ci/actions/backporting@main with: target-branch: ${{ matrix.target-branch }} additional-reviewers: ${REVIEWERS} \ No newline at end of file diff --git a/Makefile b/Makefile index 150a74a6..f57558c0 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ 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 -KOGITO_APPS_TARGET_URI ?= https://github.com/kiegroup/kogito-apps.git +KOGITO_APPS_TARGET_URI ?= https://github.com/apache/incubator-kie-kogito-apps.git BUILD_ENGINE ?= docker BUILD_ENGINE_TLS_OPTIONS ?= '' .DEFAULT_GOAL := build diff --git a/README.md b/README.md index f7c8b91c..f61da8c4 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,11 @@ Kogito <p align="center"><img width=55% height=55% src="docsimg/kogito.png"></p> -[](https://github.com/kiegroup/kogito-images/stargazers) -[](https://github.com/kiegroup/kogito-images/network/members) -[](https://github.com/kiegroup/kogito-images/pulls) -[](https://github.com/kiegroup/kogito-images/graphs/contributors) -[](https://github.com/kiegroup/kogito-images/blob/main/LICENSE) +[](https://github.com/apache/incubator-kie-kogito-images/stargazers) +[](https://github.com/apache/incubator-kie-kogito-images/network/members) +[](https://github.com/apache/incubator-kie-kogito-images/pulls) +[](https://github.com/apache/incubator-kie-kogito-images/graphs/contributors) +[](https://github.com/apache/incubator-kie-kogito-images/blob/main/LICENSE) [](https://twitter.com/kogito_kie?lang=en) @@ -231,12 +231,12 @@ See the next topic for an example. #### Kogito s2i Builder Image example ##### S2i Builder Image Example with Quarkus -In this example, let's use a simple application based on Quarkus that is available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples) +In this example, let's use a simple application based on Quarkus that is available in the [Kogito Examples](https://github.com/apache/incubator-kie-kogito-examples) repository: the *rules-quarkus-helloworld* example, with native compilation disabled. ```bash -$ s2i build https://github.com/kiegroup/kogito-examples.git \ +$ s2i build https://github.com/apache/incubator-kie-kogito-examples.git \ --ref main \ -e RUNTIME_TYPE=quarkus \ --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \ @@ -279,11 +279,11 @@ $ curl -H "Content-Type: application/json" -X POST -d '{"strings":["hello"]}' ht ##### S2i Builder Image Example with Springboot -In this example, let's use a simple application based on Spring Boot that is available in the [Kogito Examples](https://github.com/kiegroup/kogito-examples) +In this example, let's use a simple application based on Spring Boot that is available in the [Kogito Examples](https://github.com/apache/incubator-kie-kogito-examples) repository: the *process-springboot-example*. ```bash -$ s2i build https://github.com/kiegroup/kogito-examples.git \ +$ s2i build https://github.com/apache/incubator-kie-kogito-examples.git \ --ref main \ --context-dir kogito-springboot-examples/process-springboot-example \ -e RUNTIME_TYPE=springboot \ @@ -320,7 +320,7 @@ Let's start 2 builds with the incremental option enabled and compare the time sp ```bash # First incremental build -$ time s2i build https://github.com/kiegroup/kogito-examples.git \ +$ time s2i build https://github.com/apache/incubator-kie-kogito-examples.git \ --ref main \ -e RUNTIME_TYPE=quarkus --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \ @@ -338,7 +338,7 @@ And now, let's run it again. ```bash # Second incremental build -$ time s2i build https://github.com/kiegroup/kogito-examples.git \ +$ time s2i build https://github.com/apache/incubator-kie-kogito-examples.git \ --ref main \ -e RUNTIME_TYPE=quarkus --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \ @@ -366,7 +366,7 @@ To make it possible we just need to set the **MAVEN_MIRROR_URL** environment var ```bash # Third incremental build, with Maven mirror option -$ time s2i build https://github.com/kiegroup/kogito-examples.git \ +$ time s2i build https://github.com/apache/incubator-kie-kogito-examples.git \ --ref main \ -e RUNTIME_TYPE=quarkus --context-dir kogito-quarkus-examples/rules-quarkus-helloworld \ @@ -435,8 +435,8 @@ If you don't have an already existing project, the best way to create a new one to generate project structure. The available archetypes are: -- [Kogito Quarkus Archetype](https://github.com/kiegroup/kogito-runtimes/tree/main/archetypes/kogito-quarkus-archetype) -- [Kogito Spring Boot Archetype](https://github.com/kiegroup/kogito-runtimes/tree/main/archetypes/kogito-springboot-archetype) +- [Kogito Quarkus Archetype](https://github.com/apache/incubator-kie-kogito-runtimes/tree/main/archetypes/kogito-quarkus-archetype) +- [Kogito Spring Boot Archetype](https://github.com/apache/incubator-kie-kogito-runtimes/tree/main/archetypes/kogito-springboot-archetype) Note that, when building Quarkus based application that is **not** an *UberJAR* we also need to copy the **lib** directory located inside the *target* directory. @@ -476,7 +476,7 @@ docker run -it quay.io/kiegroup/kogito-runtime-jvm:latest /home/kogito/kogito-ap In the next few lines let's take a look on how this image can be used to receive an already built UberJAR. To configure Quarkus to generate an UberJAR please follow the instructions described [here](https://quarkus.io/guides/maven-tooling#configuration-reference) -For this example let's use the [process-quarkus-example](https://github.com/kiegroup/kogito-examples/tree/stable/kogito-quarkus-examples/process-quarkus-example). +For this example let's use the [process-quarkus-example](https://github.com/apache/incubator-kie-kogito-examples/tree/stable/kogito-quarkus-examples/process-quarkus-example). Once you have checked out the example on your local machine follow the steps below: **Example with UberJAR** @@ -681,7 +681,7 @@ $ docker run -it --env SCRIPT_DEBUG=true --env QUARKUS_INFINISPAN_CLIENT_HOSTS=m You should notice a few debug messages present in the system output. -The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Data Index Service +The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Data Index Service to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. ### Kogito Explainability Component Image @@ -702,7 +702,7 @@ You should notice a few debug messages being printed in the system output. To know what configurations this image accepts please take a look [here](kogito-explainability-image.yaml) on the **envs** section. -The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Explainability Service +The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Explainability Service to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. @@ -746,7 +746,7 @@ You should notice a few debug messages being printed in the system output. To know what configurations this image accepts please take a look [here](kogito-trusty-image.yaml) on the **envs** section. -The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty Service +The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Trusty Service to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. ### Kogito Jobs Service Component Images @@ -754,7 +754,7 @@ to your Kogito infrastructure on a Kubernetes cluster and provide its capabiliti The Kogito Jobs Service is a dedicated lightweight service responsible for scheduling jobs that aim at firing at a given time. It does not execute the job itself, but it triggers a callback that could be an HTTP request on a given endpoint specified on the job request, or any other callback that could be supported by the service. -For more information please visit this [link](https://github.com/kiegroup/kogito-runtimes/wiki/Job-Service). +For more information please visit this [link](https://github.com/apache/incubator-kie-kogito-runtimes/wiki/Job-Service). Today, the Jobs service contains four images: @@ -820,7 +820,7 @@ podman-compose -f contrib/jobs-service/container-compose-<variant>.yaml up The above command will spinup the Jobs-service so you can connect your application. -The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Jobs Service +The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Jobs Service to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications @@ -849,7 +849,7 @@ You should notice a few debug messages being printed in the system output. To know what configurations this image accepts please take a look [here](kogito-management-console-image.yaml) on the **envs** section. -The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Management Console +The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Management Console to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. ### Kogito Task Console Component Image @@ -874,7 +874,7 @@ You should notice a few debug messages being printed in the system output. To know what configurations this image accepts please take a look [here](kogito-task-console-image.yaml) on the **envs** section. -The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Task Console +The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Task Console to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. ### Kogito Trusty UI Component Image @@ -899,12 +899,12 @@ You should notice a few debug messages being printed in the system output. To know what configurations this image accepts please take a look [here](kogito-trusty-ui-image.yaml) on the **envs** section. -The [Kogito Operator](https://github.com/kiegroup/kogito-cloud-operator) can be used to deploy the Kogito Trusty UI +The [Kogito Operator](https://github.com/apache/incubator-kie-kogito-operator) can be used to deploy the Kogito Trusty UI to your Kogito infrastructure on a Kubernetes cluster and provide its capabilities to your Kogito applications. ### Kogito JIT Runner Component Image -The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/kiegroup/kogito-apps/tree/main/jitexecutor). +The Kogito JIT Runner provides a tool that allows you to submit a DMN model and evaluate it on the fly with a simple HTTP request. You can find more details on JIT [here](https://github.com/apache/incubator-kie-kogito-apps/tree/main/jitexecutor). Basic usage: @@ -930,10 +930,10 @@ Once the images are built and imported into a registry (quay.io or any other reg As a first step, we need to make the Kogito Images available as Image Streams in OpenShift. If you have `cluster-admin` rights you can deploy it into the **openshift** namespace, otherwise, deploy it into the namespace where you have permissions. -To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/kiegroup/kogito-images/main/kogito-imagestream.yaml). +To install the image stream use this imagestream file: [kogito-imagestream.yaml](https://raw.githubusercontent.com/apache/incubator-kie-kogito-images/main/kogito-imagestream.yaml). It points to the latest released version. -Let's use the *kogito-quarkus-examples/rules-quarkus-helloworld* from [Kogito Examples](https://github.com/kiegroup/kogito-examples). +Let's use the *kogito-quarkus-examples/rules-quarkus-helloworld* from [Kogito Examples](https://github.com/apache/incubator-kie-kogito-examples). ```bash # creating a new namespace @@ -947,7 +947,7 @@ You can add applications to this project with the 'new-app' command. For example to build a new example application in Ruby. # installing the imagestream on the current namespace -$ oc create -f https://raw.githubusercontent.com/kiegroup/kogito-images/0.16.0/kogito-imagestream.yaml +$ oc create -f https://raw.githubusercontent.com/apache/incubator-kie-kogito-images/0.16.0/kogito-imagestream.yaml imagestream.image.openshift.io/kogito-runtime-native created imagestream.image.openshift.io/kogito-runtime-jvm created imagestream.image.openshift.io/kogito-s2i-builder created @@ -967,7 +967,7 @@ imagestream.image.openshift.io/kogito-management-console created # performing a new build $ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-s2i-builder:latest \ - https://github.com/kiegroup/kogito-examples.git#main --context-dir=kogito-quarkus-examples/rules-quarkus-helloworld \ + https://github.com/apache/incubator-kie-kogito-examples.git#main --context-dir=kogito-quarkus-examples/rules-quarkus-helloworld \ --strategy=source --env NATIVE=false --> Found image 8c9d756 (5 days old) in image stream "rules-quarkus-helloworld/kogito-s2i-builder" under tag "latest" for "kogito-s2i-builder:latest" @@ -978,7 +978,7 @@ $ oc new-build --name=rules-quarkus-helloworld-builder --image-stream=kogito-s2i Tags: builder, kogito, quarkus * The source repository appears to match: jee - * A source build using source code from https://github.com/kiegroup/kogito-examples.git#main will be created + * A source build using source code from https://github.com/apache/incubator-kie-kogito-examples.git#main will be created * The resulting image will be pushed to image stream tag "rules-quarkus-helloworld-builder:latest" * Use 'start-build' to trigger a new build @@ -1077,7 +1077,7 @@ As output, you should see the following response: ``` -For more complex deployment, please use the [Kogito Cloud Operator](https://github.com/kiegroup/kogito-cloud-operator) +For more complex deployment, please use the [Kogito Cloud Operator](https://github.com/apache/incubator-kie-kogito-operator) diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh index d9353944..2703cb5f 100755 --- a/scripts/build-kogito-apps-components.sh +++ b/scripts/build-kogito-apps-components.sh @@ -2,7 +2,7 @@ # Parameters: # 1 - image name - can't be empty. # 2 - git target branch - defaults to main -# 3 - git target uri - defaults to https://github.com/kiegroup/kogito-apps.git +# 3 - git target uri - defaults to https://github.com/apache/incubator-kie-kogito-apps.git # fast fail set -e @@ -13,7 +13,7 @@ KOGITO_APPS_REPO_NAME="kogito-apps" # Read entries before sourcing imageName="${1}" gitBranch="${2:-main}" -gitUri="${3:-https://github.com/kiegroup/kogito-apps.git}"; +gitUri="${3:-https://github.com/apache/incubator-kie-kogito-apps.git}"; contextDir="" shift $# @@ -24,7 +24,7 @@ APPS_MAVEN_OPTIONS="-Dquarkus.package.type=fast-jar -Dquarkus.build.image=false" # used for all-in-one image extended_context="" -# Fix taken from https://github.com/kiegroup/kogito-apps/pull/1762 +# Fix taken from https://github.com/apache/incubator-kie-kogito-apps/pull/1762 if [ ! -z "${CYPRESS_BINARY_URL}" ]; then export CYPRESS_INSTALL_BINARY="${CYPRESS_BINARY_URL}/cypress-9.7.0.zip" echo "Setting 'CYPRESS_INSTALL_BINARY' variable to ${CYPRESS_INSTALL_BINARY}" diff --git a/scripts/common.py b/scripts/common.py index f00377ff..5a164c21 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -319,7 +319,7 @@ def update_examples_uri_in_behave_tests(examples_uri): """ print("Set examples_uri {} in behave tests".format(examples_uri)) # pattern to get the default examples uri - pattern = re.compile(r'(https://github.com/kiegroup/kogito-examples.git)') + pattern = re.compile(r'(https://github.com/apache/incubator-kie-kogito-examples.git)') replacement = examples_uri update_in_behave_tests(pattern, replacement) diff --git a/tests/features/kogito-common-builder-jvm.feature b/tests/features/kogito-common-builder-jvm.feature index f405feb7..50ccacfd 100644 --- a/tests/features/kogito-common-builder-jvm.feature +++ b/tests/features/kogito-common-builder-jvm.feature @@ -8,7 +8,7 @@ Feature: kogito-s2i-builder image JVM build tests And run sh -c 'echo $JAVA_HOME' in container and immediately check its output for /usr/lib/jvm/java-11 Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main | variable | value | | NATIVE | false | | RUNTIME_TYPE | quarkus | @@ -26,7 +26,7 @@ Feature: kogito-s2i-builder image JVM build tests And file /home/kogito/cacerts should exist Scenario: Verify if the s2i build is finished as expected with non native build and no runtime image and no RUNTIME_TYPE defined - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main | variable | value | | NATIVE | false | Then check that page is served @@ -43,7 +43,7 @@ Feature: kogito-s2i-builder image JVM build tests And file /home/kogito/cacerts should exist Scenario: Verify if the s2i build is finished as expected performing a non native build with runtime image - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | NATIVE | false | | RUNTIME_TYPE | quarkus | @@ -78,7 +78,7 @@ Feature: kogito-s2i-builder image JVM build tests And file /home/kogito/bin/quarkus-run.jar should exist Scenario: Verify if the multi-module s2i build is finished as expected performing a non native build - Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | false | @@ -96,11 +96,11 @@ Feature: kogito-s2i-builder image JVM build tests And file /home/kogito/bin/quarkus-run.jar should exist Scenario: Perform an incremental s2i build using quarkus runtime type - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | false | - And s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main + And s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | false | @@ -120,7 +120,7 @@ Feature: kogito-s2i-builder image JVM build tests #### SpringBoot Scenarios Scenario: Verify if the s2i build is finished as expected with debug enabled - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | RUNTIME_TYPE | springboot | | JAVA_OPTIONS | -Ddebug=true | @@ -138,7 +138,7 @@ Feature: kogito-s2i-builder image JVM build tests And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true Scenario: Verify if the s2i build is finished as expected with no runtime image and debug enabled - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main | variable | value | | JAVA_OPTIONS | -Ddebug=true | | RUNTIME_TYPE | springboot | @@ -173,7 +173,7 @@ Feature: kogito-s2i-builder image JVM build tests And container log should contain Tomcat initialized with port(s): 8080 (http) Scenario: Verify if the s2i build is finished as expected using multi-module build with debug enabled - Given s2i build https://github.com/kiegroup/kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from . using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | JAVA_OPTIONS | -Ddebug=true | | RUNTIME_TYPE | springboot | @@ -193,11 +193,11 @@ Feature: kogito-s2i-builder image JVM build tests And run sh -c 'echo $JAVA_OPTIONS' in container and immediately check its output for -Ddebug=true Scenario: Perform an incremental s2i build using springboot runtime type - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty. | variable | value | | RUNTIME_TYPE | springboot | - And s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main + And s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example with env and incremental using nightly-main # Leave those here as placeholder for scripts adding variable to the test. No impact on tests if empty. | variable | value | | RUNTIME_TYPE | springboot | @@ -215,7 +215,7 @@ Feature: kogito-s2i-builder image JVM build tests | expected_status_code | 201 | Scenario: Verify if the s2i build is finished as expected with uber-jar package type built - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | MAVEN_ARGS_APPEND | -Dquarkus.package.type=uber-jar | | RUNTIME_TYPE | quarkus | diff --git a/tests/features/kogito-s2i-builder-native.feature b/tests/features/kogito-s2i-builder-native.feature index 62a3a19f..d5e78cc6 100644 --- a/tests/features/kogito-s2i-builder-native.feature +++ b/tests/features/kogito-s2i-builder-native.feature @@ -15,7 +15,7 @@ Feature: kogito-s2i-builder image native build tests And run sh -c 'echo $GRAALVM_VERSION' in container and immediately check its output for 22.3.2 Scenario: Verify if the s2i build is finished as expected using native build and runtime image - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest | variable | value | | NATIVE | true | | RUNTIME_TYPE | quarkus | @@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image native build tests And s2i build log should contain -J-Xmx2576980378 Scenario: Verify if the s2i build is finished as expected using native build and no runtime image - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld using nightly-main | variable | value | | NATIVE | true | | RUNTIME_TYPE | quarkus | @@ -71,7 +71,7 @@ Feature: kogito-s2i-builder image native build tests And s2i build log should contain -J-Xmx5153960755 Scenario: Verify if the s2i build is finished as expected performing a native build with persistence enabled - Step 1: build the application and copy to the runtime image - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-native:latest | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | true | @@ -84,11 +84,11 @@ Feature: kogito-s2i-builder image native build tests And s2i build log should contain -J-Xmx5153960755 Scenario: Perform an incremental s2i build for native test - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | false | - And s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main + And s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/rules-quarkus-helloworld with env and incremental using nightly-main | variable | value | | RUNTIME_TYPE | quarkus | | NATIVE | true | diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature index 5238f47f..290b44cb 100644 --- a/tests/features/kogito-s2i-builder.feature +++ b/tests/features/kogito-s2i-builder.feature @@ -23,7 +23,7 @@ Feature: kogito-s2i-builder image tests And file /home/kogito/.m2/settings.xml should not contain <url>https://maven.repository.redhat.com/techpreview/all</url> Scenario: Verify if the s2i build is finished as expected performing a non native build with persistence enabled - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-quarkus-examples/process-quarkus-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | NATIVE | false | | RUNTIME_TYPE | quarkus | @@ -33,7 +33,7 @@ Feature: kogito-s2i-builder image tests And s2i build log should contain '/home/kogito/bin/persons.proto' -> '/home/kogito/data/protobufs/persons.proto' Scenario: Verify if the s2i build is finished as expected with persistence enabled - Given s2i build https://github.com/kiegroup/kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest + Given s2i build https://github.com/apache/incubator-kie-kogito-examples.git from kogito-springboot-examples/process-springboot-example using nightly-main and runtime-image quay.io/kiegroup/kogito-runtime-jvm:latest | variable | value | | MAVEN_ARGS_APPEND | -Ppersistence | | RUNTIME_TYPE | springboot | diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh index 360d1d9f..06580657 100755 --- a/tests/test-apps/clone-repo.sh +++ b/tests/test-apps/clone-repo.sh @@ -36,7 +36,7 @@ set -e # Clone examples cd /tmp rm -rf kogito-examples/ -git clone https://github.com/kiegroup/kogito-examples.git +git clone https://github.com/apache/incubator-kie-kogito-examples.git cd kogito-examples/ git fetch origin git fetch origin --tags --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
