You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by ri...@apache.org on 2023/11/21 20:13:51 UTC
(incubator-kie-kogito-images) branch radtriste-fix-pipelines updated (9890a0c2 -> c2e0799a)
This is an automated email from the ASF dual-hosted git repository.
ricardozanini pushed a change to branch radtriste-fix-pipelines
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-images.git
omit 9890a0c2 Revert find expression and command
omit 20820944 Add E command handler to find script
omit b94d9a60 Fix temporary dir creation on bats test
omit 2d357c16 Fix problem with builder script copying files for swf-builder-image
omit e008d99f Tidying the PR up #1
omit 73e90402 yet another startup command change
omit da4f889d adjust trusty feature file
omit 6fe312ab fix one feature file
omit d6a8c2ed use skopeo installed in image
omit 9fa2af0e add initial sleep into startup command in common-build-runtime tests
omit dadd463f add initial sleep into startup command in common-dynamic-resources tests
omit df593ca5 fix bash
omit d8b87cc9 try log everything
omit eed8fd1e try read logs from buildkit
omit 2ab152f7 collect logs from all containers
omit cde5f51b try bash
omit b3d0aaee replace mailing lists
omit b53c3043 tweak logs collection
omit d02f45d8 fix build.log archiving
omit 9dc63bb1 small tweaks
omit 59142b90 tweak pipeline config
omit 9fd1ee60 adjust folder for tests
omit f87b03ed set global config
omit 798a845e set git config
omit 1ac94d51 invoke bash explicitly to process bash directives
omit 0caa07e1 fix settings.xml
omit 099dbb14 remove jboss repository references
omit fee23830 prevent repeated checkout
omit a47e5534 adjust KOGITO_APPS_REPO_NAME
omit 28e3289d adjust repository URLs after transfer
omit 6ce5cd3f hold localRegistryUrl after startup
omit c0d44bce use open ports
omit 3d798a08 fix method name
omit e9472065 provide correct creds
omit c912b283 pass PR source repository name
omit 74ecbb7c env printout
omit 2741ef9a fix closure
omit 554454ee refactor Jenkinsfile to a dummy trigger
omit c85a93b7 use plain ubuntu in Jenkinsfile
omit 7eb3d1d8 fix util method call params
omit 31374a12 call the method actually
omit b2850db1 generate also build-image job
omit 987d2907 Update kogito-images job to follow apache config
omit f1b0e594 Fix branch name
omit d044e9ea update jenkinsfile
omit 9c6f9fcc updated Jenkinsfile
omit 451095bb Fix pipelines
add 98e816b4 Update .asf.yaml to enable GitHub Issues (#1710)
new 4e602316 Fix pipelines
new 7dde50ed updated Jenkinsfile
new 669d7809 update jenkinsfile
new 9c57cc5d Fix branch name
new 311866d2 Update kogito-images job to follow apache config
new 28dcc040 generate also build-image job
new 96b8ef19 call the method actually
new 0730fa57 fix util method call params
new f81e186b use plain ubuntu in Jenkinsfile
new 1f4ec14f refactor Jenkinsfile to a dummy trigger
new 2f9f34a0 fix closure
new b673b949 env printout
new a9fab770 pass PR source repository name
new e5f098b8 provide correct creds
new 1d5caeb6 fix method name
new 3ba1632a use open ports
new 055a4c66 hold localRegistryUrl after startup
new f8c825e3 adjust repository URLs after transfer
new 41088bc9 adjust KOGITO_APPS_REPO_NAME
new cb9ccb5d prevent repeated checkout
new b08a2f0f remove jboss repository references
new 150ba519 fix settings.xml
new 8b1180b4 invoke bash explicitly to process bash directives
new 8dc696b9 set git config
new d1bddd1a set global config
new 41dccfbf adjust folder for tests
new b8799bdf tweak pipeline config
new 03750868 small tweaks
new ed0ac1a3 fix build.log archiving
new ded1a4f7 tweak logs collection
new ab4c84c8 replace mailing lists
new 7419400a try bash
new 23086f97 collect logs from all containers
new 270ffaa4 try read logs from buildkit
new 2338e98d try log everything
new f393cabc fix bash
new 86de06ba add initial sleep into startup command in common-dynamic-resources tests
new 8a408907 add initial sleep into startup command in common-build-runtime tests
new eedae281 use skopeo installed in image
new 3ec27648 fix one feature file
new 865bbe52 adjust trusty feature file
new 93d9601e yet another startup command change
new 6a325bfc Tidying the PR up #1
new 1bad3b8f Fix problem with builder script copying files for swf-builder-image
new 90488010 Fix temporary dir creation on bats test
new d65e88f5 Add E command handler to find script
new c2e0799a Revert find expression and command
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9890a0c2)
\
N -- N -- N refs/heads/radtriste-fix-pipelines (c2e0799a)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 47 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.asf.yaml | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 .asf.yaml
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 10/47: refactor Jenkinsfile to a dummy trigger
Posted by ri...@apache.org.
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 1f4ec14fc9b2757efe4c5db1b26493956acd3a21
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 8 13:27:07 2023 +0100
refactor Jenkinsfile to a dummy trigger
---
.ci/jenkins/Jenkinsfile | 77 +++-------------------
.../{Jenkinsfile => Jenkinsfile.build-and-test} | 21 ++++--
.ci/jenkins/dsl/jobs.groovy | 54 +++++++++++++++
3 files changed, 78 insertions(+), 74 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index d80ffec6..86548427 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -6,94 +6,33 @@ pipeline {
}
options {
timeout(time: 120, unit: 'MINUTES')
+ disableConcurrentBuilds(abortPrevious: true)
+ skipDefaultCheckout()
}
stages {
- stage('Initialization') {
- steps {
- script {
- sh 'printenv'
-
- dir(getRepoName()) {
- // githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorCredentialsId(), usernamePassword: 'kie-ci'])
- // TODO Test pupose
- deleteDir()
- checkout(githubscm.resolveRepository('incubator-kie-kogito-images', 'apache', 'radtriste-fix-pipelines', false))
- }
- }
- }
- }
- stage('Validate CeKit Image and Modules descriptors') {
- steps {
- script {
- dir(getRepoName()) {
- sh '''
- curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
- tar -xzvf cekit-image-validator-runner.tgz
- chmod +x cekit-image-validator-runner
- '''
- sh './cekit-image-validator-runner modules/'
- getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
- }
- }
- }
- }
- stage('Build & Test Images') {
- steps {
- script {
- dir(getRepoName()) {
- parallelStages = [:]
- for(String image : getImages()){
- parallelStages[image] = createBuildAndTestStageClosure(image)
- }
- parallel parallelStages
- }
- }
- }
- }
- }
- post {
- unsuccessful {
- script {
- pullrequest.postComment(util.getMarkdownTestSummary('PR', '', "${BUILD_URL}", 'GITHUB'))
- }
- }
- }
-}
-
-Closure createBuildAndTestStageClosure(String image) {
- return {
- stage("Build&Test ${image}") {
+ stage("Build&Test") {
List buildParams = []
buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${CHANGE_ID} - ${image}: ${CHANGE_URL}"))
- buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
+ buildParams.add(string(name: "CHANGE_ID", value: CHANGE_ID))
+ buildParams.add(string(name: "CHANGE_URL", value: CHANGE_URL))
buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
- githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getGitAuthorCredentialsId())
- githubscm.updateGithubCommitStatus(image, 'PENDING', 'Queued', getRepoName())
-
// Keep executing so we can cancel all if needed
- def job = build(job: "${getRepoName()}.build-image", wait: true, parameters: buildParams, propagate: false)
+ def job = build(job: "${getRepoName()}.build-and-test", wait: true, parameters: buildParams, propagate: false)
if (job.result != 'SUCCESS') {
if (job.result == 'UNSTABLE') {
- unstable("Tests on ${image} seems to have failed")
+ unstable("Tests on images seems to have failed: ${job.absoluteUrl}")
} else {
- error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
+ error("Error building images. Please check the logs of the job: ${job.absoluteUrl}")
}
}
}
}
}
-String[] getImages() {
- if (env.IMAGES_LIST) {
- return env.IMAGES_LIST.split(',')
- }
- return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
-}
-
String getChangeAuthor() {
return CHANGE_AUTHOR
}
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile.build-and-test
similarity index 92%
copy from .ci/jenkins/Jenkinsfile
copy to .ci/jenkins/Jenkinsfile.build-and-test
index d80ffec6..12eb8a76 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -2,7 +2,10 @@
pipeline {
agent {
- label 'ubuntu'
+ docker {
+ image env.AGENT_DOCKER_BUILDER_IMAGE
+ args env.AGENT_DOCKER_BUILDER_ARGS
+ }
}
options {
timeout(time: 120, unit: 'MINUTES')
@@ -64,7 +67,7 @@ Closure createBuildAndTestStageClosure(String image) {
return {
stage("Build&Test ${image}") {
List buildParams = []
- buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${CHANGE_ID} - ${image}: ${CHANGE_URL}"))
+ buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${getChangeId()} - ${image}: ${getChangeUrl()}"))
buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
@@ -95,15 +98,23 @@ String[] getImages() {
}
String getChangeAuthor() {
- return CHANGE_AUTHOR
+ return SOURCE_AUTHOR
}
String getChangeBranch() {
- return CHANGE_BRANCH
+ return SOURCE_BRANCH
}
String getChangeTarget() {
- return CHANGE_TARGET
+ return TARGET_BRANCH
+}
+
+String getChangeId() {
+ return CHANGE_ID
+}
+
+String getChangeUrl() {
+ return CHANGE_URL
}
String getRepoName() {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 7655e5bc..cf649084 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -39,6 +39,7 @@ setupQuarkusUpdateJob()
void setupPrJob() {
setupBuildImageJob(JobType.PULL_REQUEST)
+ setupBuildAndTestJob(JobType.PULL_REQUEST)
// Branch Source Plugin multibranchPipelineJob
Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile", JobType.PULL_REQUEST.getName())
@@ -181,6 +182,59 @@ void setupBuildImageJob(JobType jobType) {
}
}
+void setupBuildAndTestJob(JobType jobType) {
+ def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.build-and-test', jobType, "${jenkins_path}/Jenkinsfile.build-and-test", 'Kogito Images Build And test images')
+ // Use jenkinsfile from the build branch
+ jobParams.git.author = '${SOURCE_AUTHOR}'
+ jobParams.git.branch = '${SOURCE_BRANCH}'
+ JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
+ jobParams.env.putAll([
+ MAX_REGISTRY_RETRIES: 3,
+ TARGET_AUTHOR: Utils.getGitAuthor(this), // In case of a PR to merge with target branch
+
+ AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
+ AUTHOR_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
+ ])
+ if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
+ jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
+ }
+ KogitoJobTemplate.createPipelineJob(this, jobParams)?.with {
+ logRotator {
+ daysToKeep(10)
+ }
+ parameters {
+ stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
+
+ stringParam('SOURCE_AUTHOR', Utils.getGitAuthor(this), 'Build author')
+ stringParam('SOURCE_BRANCH', Utils.getGitBranch(this), 'Build branch name')
+ stringParam('TARGET_BRANCH', '', '(Optional) In case of a PR to merge with target branch, please provide the target branch')
+ stringParam('CHANGE_ID', '', 'CHANGE_ID coming from Branch Source Plugin')
+ stringParam('CHANGE_URL', '', 'CHANGE_URL coming from Branch Source Plugin')
+
+ // Build information
+ stringParam('MAVEN_ARTIFACTS_REPOSITORY', "${MAVEN_ARTIFACTS_REPOSITORY}")
+ stringParam('BUILD_KOGITO_APPS_URI', '', '(Optional) Git uri to the kogito-apps repository to use for tests.')
+ stringParam('BUILD_KOGITO_APPS_REF', '', '(Optional) Git reference (branch/tag) to the kogito-apps repository to use for building. Default to BUILD_BRANCH_NAME.')
+ stringParam('QUARKUS_PLATFORM_URL', Utils.getMavenQuarkusPlatformRepositoryUrl(this), 'URL to the Quarkus platform to use. The version to use will be guessed from artifacts.')
+
+ // Test information
+ booleanParam('SKIP_TESTS', false, 'Skip tests')
+ stringParam('TESTS_KOGITO_EXAMPLES_URI', '', '(Optional) Git uri to the kogito-examples repository to use for tests.')
+ stringParam('TESTS_KOGITO_EXAMPLES_REF', '', '(Optional) Git reference (branch/tag) to the kogito-examples repository to use for tests.')
+
+ // Deploy information
+ booleanParam('DEPLOY_IMAGE', false, 'Should we deploy image to given deploy registry ?')
+ booleanParam('DEPLOY_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set to true if image should be deployed in Openshift registry.In this case, IMAGE_REGISTRY_CREDENTIALS, IMAGE_REGISTRY and IMAGE_NAMESPACE parameters will be ignored')
+ stringParam('DEPLOY_IMAGE_REGISTRY_CREDENTIALS', "${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Image registry credentials to use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+ stringParam('DEPLOY_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image registry to use to deploy images')
+ stringParam('DEPLOY_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image namespace to use to deploy images')
+ stringParam('DEPLOY_IMAGE_NAME_SUFFIX', '', 'Image name suffix to use to deploy images. In case you need to change the final image name, you can add a suffix to it.')
+ stringParam('DEPLOY_IMAGE_TAG', '', 'Image tag to use to deploy images')
+ booleanParam('DEPLOY_WITH_LATEST_TAG', false, 'Set to true if you want the deployed images to also be with the `latest` tag')
+ }
+ }
+}
+
void setupPromoteJob(JobType jobType) {
def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-promote', jobType, "${jenkins_path}/Jenkinsfile.promote", 'Kogito Images Promote')
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 37/47: add initial sleep into startup command in common-dynamic-resources tests
Posted by ri...@apache.org.
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 86de06babd656cf0dc3c6f20f658a2aadb63a5ff
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Mon Nov 20 12:11:19 2023 +0100
add initial sleep into startup command in common-dynamic-resources tests
---
tests/features/common-dynamic-resources.feature | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index 92cb56dd..23ae6475 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -24,6 +24,7 @@ Feature: Common tests for Kogito images
Scenario: Verify if the properties were correctly set using DEFAULT MEM RATIO
When container is started with args
| arg | value |
+ | command | bash -c "sleep 2s; /home/kogito/kogito-app-launch.sh" |
| mem_limit | 1073741824 |
| env_json | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 80, "JAVA_INITIAL_MEM_RATIO": 25} |
Then container log should match regex -Xms205m
@@ -32,6 +33,7 @@ Feature: Common tests for Kogito images
Scenario: Verify if the DEFAULT MEM RATIO properties are overridden with different values
When container is started with args
| arg | value |
+ | command | bash -c "sleep 2s; /home/kogito/kogito-app-launch.sh" |
| mem_limit | 1073741824 |
| env_json | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 50, "JAVA_INITIAL_MEM_RATIO": 10} |
Then container log should match regex -Xms51m
@@ -39,23 +41,24 @@ Feature: Common tests for Kogito images
Scenario: Verify if the properties were correctly set when aren't passed
When container is started with args
- | arg | value |
- | mem_limit | 1073741824 |
- | env_json | {"SCRIPT_DEBUG":"true"} |
+ | arg | value |
+ | command | bash -c "sleep 2s; /home/kogito/kogito-app-launch.sh" |
+ | mem_limit | 1073741824 |
+ | env_json | {"SCRIPT_DEBUG":"true"} |
Then container log should match regex -Xms128m
And container log should match regex -Xmx512m
Scenario: Verify if Java Remote Debug is correctly configured
When container is started with env
- | variable | value |
- | SCRIPT_DEBUG | true |
- | JAVA_DEBUG | true |
- | JAVA_DEBUG_PORT | 9222 |
+ | arg | value |
+ | command | bash -c "sleep 2s; /home/kogito/kogito-app-launch.sh" |
+ | env_json | {"SCRIPT_DEBUG":"true", "JAVA_DEBUG":"true", "JAVA_DEBUG_PORT":"9222"} |
Then container log should match regex -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9222
Scenario: Verify if the DEFAULT MEM RATIO properties are overridden with different values from user provided Xmx and Xms
When container is started with args
| arg | value |
+ | command | bash -c "sleep 2s; /home/kogito/kogito-app-launch.sh" |
| mem_limit | 1073741824 |
| env_json | {"SCRIPT_DEBUG":"true", "JAVA_MAX_MEM_RATIO": 50, "JAVA_INITIAL_MEM_RATIO": 10, "JAVA_OPTIONS":"-Xms4000m -Xmx8000m"} |
Then container log should match regex -Xms4000m
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 17/47: hold localRegistryUrl after startup
Posted by ri...@apache.org.
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 055a4c66ee261a6368f0c2cf9ad8a05486627bf5
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Fri Nov 10 10:28:59 2023 +0100
hold localRegistryUrl after startup
---
.ci/jenkins/Jenkinsfile.build-image | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 367902d5..676843c4 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -2,6 +2,8 @@
QUAY_REGISTRY = 'quay.io'
+def localRegistryUrl = '';
+
pipeline {
agent {
docker {
@@ -96,8 +98,8 @@ pipeline {
updateGithubCommitStatus('PENDING', 'Build in progress')
int freePort = cloud.findFreePort()
- String localRegistry = cloud.startLocalRegistry(freePort)
- cloud.prepareForDockerMultiplatformBuild([localRegistry],[cloud.getDockerIOMirrorRegistryConfig()], false)
+ localRegistryUrl = cloud.startLocalRegistry(freePort)
+ cloud.prepareForDockerMultiplatformBuild([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'")
@@ -224,7 +226,7 @@ String getBuiltImageTag(String imageTag = '') {
if (shouldDeployImage()) {
return "${getDeployImageRegistry()}/${getDeployImageNamespace()}/${getFinalImageName()}:${imageTag ?: getDeployImageTag()}"
} else {
- return "localhost:5000/${getBuildImageName()}:${githubscm.getCommitHash()}"
+ return "${localRegistryUrl}/${getBuildImageName()}:${githubscm.getCommitHash()}"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 09/47: use plain ubuntu in Jenkinsfile
Posted by ri...@apache.org.
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 f81e186b8b6d83c5ce09d390361d0505bd47d27c
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 8 11:56:55 2023 +0100
use plain ubuntu in Jenkinsfile
---
.ci/jenkins/Jenkinsfile | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 2d5cb62f..d80ffec6 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -2,10 +2,7 @@
pipeline {
agent {
- docker {
- image env.AGENT_DOCKER_BUILDER_IMAGE
- args env.AGENT_DOCKER_BUILDER_ARGS
- }
+ label 'ubuntu'
}
options {
timeout(time: 120, unit: 'MINUTES')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 21/47: remove jboss repository references
Posted by ri...@apache.org.
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 b08a2f0f85ea533068a11b98d7f857bb6ec21283
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Fri Nov 10 14:18:11 2023 +0100
remove jboss repository references
---
.../3.8.x-rpm/added/configure-maven.sh | 4 +--
modules/kogito-maven/3.8.x-rpm/maven/settings.xml | 15 ++++------
modules/kogito-maven/3.8.x-rpm/module.yaml | 6 ++--
.../kogito-maven/3.8.x/added/configure-maven.sh | 4 +--
modules/kogito-maven/3.8.x/maven/settings.xml | 12 ++++----
modules/kogito-maven/3.8.x/module.yaml | 6 ++--
scripts/common.py | 34 +++++++++++-----------
scripts/setup-maven.sh | 2 +-
scripts/update-repository.py | 12 ++++----
tests/test-apps/clone-repo.sh | 21 +++++++------
10 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
index 84997dae..4fbf01fa 100644
--- a/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x-rpm/added/configure-maven.sh
@@ -126,9 +126,9 @@ function ignore_maven_self_signed_certificates() {
}
function set_kogito_maven_repo() {
- local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
+ local kogito_maven_repo_url="${DEFAULT_MAVEN_REPO_URL}"
if [ -n "${kogito_maven_repo_url}" ]; then
- sed -i.bak "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
+ sed -i.bak "s|https://repository.apache.org/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
fi
}
diff --git a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
index 826461aa..a4115138 100644
--- a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
+++ b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
@@ -16,12 +16,10 @@
<profile>
<id>kogito-images</id>
- <repositories>
<repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
+ <id>apache-public-repository-group</id>
+ <name>Apache Public Repository Group</name>
+ <url>https://repository.apache.org/content/groups/public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -36,10 +34,9 @@
<pluginRepositories>
<pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
+ <id>apache-public-repository-group</id>
+ <name>Apache Public Repository Group</name>
+ <url>https://repository.apache.org/content/groups/public/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
diff --git a/modules/kogito-maven/3.8.x-rpm/module.yaml b/modules/kogito-maven/3.8.x-rpm/module.yaml
index 843bc5c6..47947941 100644
--- a/modules/kogito-maven/3.8.x-rpm/module.yaml
+++ b/modules/kogito-maven/3.8.x-rpm/module.yaml
@@ -32,9 +32,9 @@ envs:
- name: "MAVEN_DOWNLOAD_OUTPUT"
description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
example: "true"
- - name: "JBOSS_MAVEN_REPO_URL"
- value: "https://repository.jboss.org/nexus/content/groups/public/"
- description: "Defines the Jboss Maven repository for Kogito artifacts."
+ - name: "DEFAULT_MAVEN_REPO_URL"
+ value: "https://repository.apache.org/content/groups/public/"
+ description: "Defines the Default Maven repository for Kogito artifacts."
- name: "MAVEN_REPO_URL"
description: "Defines an extra Maven repository."
example: "https://nexus.test.com/group/public"
diff --git a/modules/kogito-maven/3.8.x/added/configure-maven.sh b/modules/kogito-maven/3.8.x/added/configure-maven.sh
index f53617da..0027aa01 100644
--- a/modules/kogito-maven/3.8.x/added/configure-maven.sh
+++ b/modules/kogito-maven/3.8.x/added/configure-maven.sh
@@ -126,9 +126,9 @@ function ignore_maven_self_signed_certificates() {
}
function set_kogito_maven_repo() {
- local kogito_maven_repo_url="${JBOSS_MAVEN_REPO_URL}"
+ local kogito_maven_repo_url="${DEFAULT_MAVEN_REPO_URL}"
if [ -n "${kogito_maven_repo_url}" ]; then
- sed -i.bak "s|https://repository.jboss.org/nexus/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
+ sed -i.bak "s|https://repository.apache.org/content/groups/public/|${kogito_maven_repo_url}|" "${MAVEN_SETTINGS_PATH}"
fi
}
diff --git a/modules/kogito-maven/3.8.x/maven/settings.xml b/modules/kogito-maven/3.8.x/maven/settings.xml
index 5fe723c3..233a6a6b 100644
--- a/modules/kogito-maven/3.8.x/maven/settings.xml
+++ b/modules/kogito-maven/3.8.x/maven/settings.xml
@@ -18,9 +18,9 @@
<id>kogito-images</id>
<repositories>
<repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <id>apache-public-repository-group</id>
+ <name>Apache Public Repository Group</name>
+ <url>https://repository.apache.org/content/groups/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
@@ -36,9 +36,9 @@
<pluginRepositories>
<pluginRepository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+ <id>apache-public-repository-group</id>
+ <name>Apache Public Repository Group</name>
+ <url>https://repository.apache.org/content/groups/public/</url>
<layout>default</layout>
<releases>
<enabled>true</enabled>
diff --git a/modules/kogito-maven/3.8.x/module.yaml b/modules/kogito-maven/3.8.x/module.yaml
index 0e19e6d4..147d1b65 100644
--- a/modules/kogito-maven/3.8.x/module.yaml
+++ b/modules/kogito-maven/3.8.x/module.yaml
@@ -32,9 +32,9 @@ envs:
- name: "MAVEN_DOWNLOAD_OUTPUT"
description: "If set to true will print the transfer logs for downloading/uploading of maven dependencies. Defaults to false"
example: "true"
- - name: "JBOSS_MAVEN_REPO_URL"
- value: "https://repository.jboss.org/nexus/content/groups/public/"
- description: "Defines the Jboss Maven repository for Kogito artifacts."
+ - name: "DEFAULT_MAVEN_REPO_URL"
+ value: "https://repository.apache.org/content/groups/public/"
+ description: "Defines the default Maven repository for Kogito artifacts."
- name: "MAVEN_REPO_URL"
description: "Defines an extra Maven repository."
example: "https://nexus.test.com/group/public"
diff --git a/scripts/common.py b/scripts/common.py
index 5a164c21..f1d669b1 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -361,17 +361,17 @@ def update_runtime_image_in_behave_tests(runtime_image_name, image_suffix):
update_in_behave_tests(pattern, replacement)
-def update_maven_repo_in_behave_tests(repo_url, replace_jboss_repository):
+def update_maven_repo_in_behave_tests(repo_url, replace_default_repository):
"""
Update maven repository into behave tests
:param repo_url: Maven repository url
- :param replace_jboss_repository: Set to true if default Jboss repository needs to be overriden
+ :param replace_default_repository: Set to true if default repository needs to be overriden
"""
print("Set maven repo {} in behave tests".format(repo_url))
pattern = re.compile('\|\s*variable[\s]*\|[\s]*value[\s]*\|')
env_var_key = "MAVEN_REPO_URL"
- if replace_jboss_repository:
- env_var_key = "JBOSS_MAVEN_REPO_URL"
+ if replace_default_repository:
+ env_var_key = "DEFAULT_MAVEN_REPO_URL"
replacement = "| variable | value |\n | {} | {} |".format(env_var_key,
repo_url)
update_in_behave_tests(pattern, replacement)
@@ -396,16 +396,16 @@ def update_maven_mirror_url_in_quarkus_plugin_behave_tests(mirror_url):
"MAVEN_MIRROR_URL", mirror_url)
update_in_behave_tests(pattern, replacement)
-def update_maven_repo_env_value(repo_url, replace_jboss_repository, prod=False):
+def update_maven_repo_env_value(repo_url, replace_default_repository, prod=False):
"""
Update the given maven repository value for all images/modules.
:param repo_url: Maven repository url
- :param replace_jboss_repository: Set to true if default Jboss repository needs to be ove
+ :param replace_default_repository: Set to true if default repository needs to be overidden
:param prod: if the module to be updated is prod version.
"""
env_name = "MAVEN_REPO_URL"
- if replace_jboss_repository:
- env_name = "JBOSS_MAVEN_REPO_URL"
+ if replace_default_repository:
+ env_name = "DEFAULT_MAVEN_REPO_URL"
update_env_value(env_name, repo_url, prod)
@@ -453,29 +453,29 @@ def update_examples_uri_in_clone_repo(examples_uri):
replacement = "git clone {}".format(examples_uri)
update_in_file(CLONE_REPO_SCRIPT, pattern, replacement)
-def update_maven_repo_in_build_config(repo_url, replace_jboss_repository):
+def update_maven_repo_in_build_config(repo_url, replace_default_repository):
"""
Update maven repository in build config modules
:param repo_url: Maven repository url
- :param replace_jboss_repository: Set to true if default Jboss repository needs to be overridden
+ :param replace_default_repository: Set to true if default repository needs to be overridden
"""
maven_env_name = 'MAVEN_REPO_URL'
- if replace_jboss_repository:
- maven_env_name = 'JBOSS_MAVEN_REPO_URL'
+ if replace_default_repository:
+ maven_env_name = 'DEFAULT_MAVEN_REPO_URL'
update_env_value_in_build_config_modules(maven_env_name, repo_url, True)
-def update_maven_repo_in_setup_maven(repo_url, replace_jboss_repository):
+def update_maven_repo_in_setup_maven(repo_url, replace_default_repository):
"""
Update maven repository into setup-maven.sh script
:param repo_url: Maven repository url
- :param replace_jboss_repository: Set to true if default Jboss repository needs to be overridden
+ :param replace_default_repository: Set to true if default repository needs to be overridden
"""
print("Set maven repo {} in setup-maven script".format(repo_url))
pattern = ""
replacement = ""
- if replace_jboss_repository:
- pattern = re.compile(r'(export JBOSS_MAVEN_REPO_URL=.*)')
- replacement = 'export JBOSS_MAVEN_REPO_URL="{}"'.format(repo_url)
+ if replace_default_repository:
+ pattern = re.compile(r'(export DEFAULT_MAVEN_REPO_URL=.*)')
+ replacement = 'export DEFAULT_MAVEN_REPO_URL="{}"'.format(repo_url)
else:
pattern = re.compile(r'(# export MAVEN_REPO_URL=.*)')
replacement = 'export MAVEN_REPO_URL="{}"'.format(repo_url)
diff --git a/scripts/setup-maven.sh b/scripts/setup-maven.sh
index 99dd300b..5ec16cfb 100755
--- a/scripts/setup-maven.sh
+++ b/scripts/setup-maven.sh
@@ -21,7 +21,7 @@ echo "Updating settings file ${maven_settings_path}"
# setup maven env
# Do not remove below, this can be updated by the python scripts
-export JBOSS_MAVEN_REPO_URL="https://repository.jboss.org/nexus/content/groups/public/"
+export DEFAULT_MAVEN_REPO_URL="https://repository.apache.org/content/groups/public/"
# export MAVEN_REPO_URL=
cp "${MVN_MODULE}"/maven/settings.xml "${maven_settings_path}"
export MAVEN_SETTINGS_PATH="${maven_settings_path}"
diff --git a/scripts/update-repository.py b/scripts/update-repository.py
index 9103b468..0ed9b8a2 100644
--- a/scripts/update-repository.py
+++ b/scripts/update-repository.py
@@ -14,8 +14,8 @@ if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Update Maven information in repo from the given artifact url and '
'version.')
parser.add_argument('--repo-url', dest='repo_url', help='Defines the url of the repository to setup into the tests')
- parser.add_argument('--replace-jboss-repo', dest='replace_jboss_repo', default=False, action='store_true',
- help='Enable if repo-url should replace the main JBoss repository')
+ parser.add_argument('--replace-default-repo', dest='replace_default_repo', default=False, action='store_true',
+ help='Enable if repo-url should replace the default repository')
parser.add_argument('--ignore-self-signed-cert', dest='ignore_self_signed_cert', default=False,
action='store_true',
help='If set to true will relax the SSL for user-generated self-signed certificates')
@@ -41,11 +41,11 @@ if __name__ == "__main__":
args = parser.parse_args()
if args.repo_url:
- common.update_maven_repo_in_build_config(args.repo_url, args.replace_jboss_repo)
- common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_jboss_repo)
- common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_jboss_repo)
+ common.update_maven_repo_in_build_config(args.repo_url, args.replace_default_repo)
+ common.update_maven_repo_in_setup_maven(args.repo_url, args.replace_default_repo)
+ common.update_maven_repo_in_behave_tests(args.repo_url, args.replace_default_repo)
if not args.tests_only:
- common.update_maven_repo_env_value(args.repo_url, args.replace_jboss_repo, args.prod)
+ common.update_maven_repo_env_value(args.repo_url, args.replace_default_repo, args.prod)
if args.ignore_self_signed_cert:
common.ignore_maven_self_signed_certificate_in_build_config()
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 06580657..6433f055 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -3,6 +3,8 @@
# Clone the kogito-examples and edit the rules-quarkus-helloworld and dmn-quarkus-example for testing purposes
# if image name is supporting services, don't build it
IMAGE_NAME="$2"
+KOGITO_EXAMPLES_REPO_NAME='incubator-kie-kogito-examples'
+
prod=""
if [ -n "${IMAGE_NAME}" ]; then
if [[ ${IMAGE_NAME} =~ rhpam|logic* ]]; then
@@ -34,16 +36,17 @@ fi
set -e
# Clone examples
+KOGITO_EXAMPLES_DIR=/tmp/${KOGITO_EXAMPLES_REPO_NAME}
cd /tmp
-rm -rf kogito-examples/
-git clone https://github.com/apache/incubator-kie-kogito-examples.git
-cd kogito-examples/
+rm -rf ${KOGITO_EXAMPLES_REPO_NAME}
+git clone https://github.com/apache/${KOGITO_EXAMPLES_REPO_NAME}.git
+cd ${KOGITO_EXAMPLES_REPO_NAME}/
git fetch origin
git fetch origin --tags
git checkout -b nightly-main
# make a new copy of rules-quarkus-helloworld for native tests
-cp -rv /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/ /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/
+cp -rv ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld/ ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld-native/
set -x
@@ -53,19 +56,19 @@ mvn -f kogito-springboot-examples/process-springboot-example clean package ${MAV
if [ "$NATIVE_BUILD" = 'true' ]; then
mvn -f kogito-quarkus-examples/rules-quarkus-helloworld-native -Dnative clean package ${MAVEN_OPTIONS} ${MAVEN_QUARKUS_NATIVE_CONTAINER_BUILD_ARGS}
- ls -lah /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld-native/target/
+ ls -lah ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld-native/target/
fi
# preparing directory to run kogito maven archetypes tests
-mkdir -pv /tmp/kogito-examples/dmn-example
-cp /tmp/kogito-examples/kogito-quarkus-examples/dmn-quarkus-example/src/main/resources/* /tmp/kogito-examples/dmn-example/
+mkdir -pv ${KOGITO_EXAMPLES_DIR}/dmn-example
+cp ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/dmn-quarkus-example/src/main/resources/* ${KOGITO_EXAMPLES_DIR}/dmn-example/
# by adding the application.properties file telling app to start on
# port 10000, the purpose of this tests is make sure that the images
# will ensure the use of the port 8080.
-cp ${base_dir}/application.properties /tmp/kogito-examples/kogito-quarkus-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
-(echo ""; echo "server.port=10000") >> /tmp/kogito-examples/kogito-springboot-examples/process-springboot-example/src/main/resources/application.properties
+cp ${base_dir}/application.properties ${KOGITO_EXAMPLES_DIR}/kogito-quarkus-examples/rules-quarkus-helloworld/src/main/resources/META-INF/
+(echo ""; echo "server.port=10000") >> ${KOGITO_EXAMPLES_DIR}/kogito-springboot-examples/process-springboot-example/src/main/resources/application.properties
set +x
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 33/47: collect logs from all containers
Posted by ri...@apache.org.
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 23086f97403594d4c7839ab8ea6e2d48d29aa1b3
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 16 11:50:05 2023 +0100
collect logs from all containers
---
.ci/jenkins/Jenkinsfile.build-image | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index a970a080..809e860e 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -207,7 +207,7 @@ pipeline {
void collectContainerLogs() {
sh '''#!/bin/bash
- for container in $(docker container ls --format "{{.Names}}"); do docker logs $container >& ${container}-container.log; done
+ for container in $(docker container ls -a --format "{{.Names}}"); do docker logs $container >& ${container}-container.log; done
'''
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 16/47: use open ports
Posted by ri...@apache.org.
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 3ba1632a5c6952d2da437b4f3d7547a2057afc09
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 9 13:42:41 2023 +0100
use open ports
---
.ci/jenkins/Jenkinsfile.build-and-test | 2 +-
.ci/jenkins/Jenkinsfile.build-image | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
index 36e426f5..914762b5 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -78,7 +78,7 @@ Closure createBuildAndTestStageClosure(String image) {
githubscm.updateGithubCommitStatus(image, 'PENDING', 'Queued', getRepoName())
// Keep executing so we can cancel all if needed
- def job = build(job: "${getRepoName()}.build-image", wait: true, parameters: buildParams, propagate: false)
+ def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
if (job.result != 'SUCCESS') {
if (job.result == 'UNSTABLE') {
unstable("Tests on ${image} seems to have failed")
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index d3bdbcfd..367902d5 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -95,7 +95,8 @@ pipeline {
script {
updateGithubCommitStatus('PENDING', 'Build in progress')
- String localRegistry = cloud.startLocalRegistry()
+ int freePort = cloud.findFreePort()
+ String localRegistry = cloud.startLocalRegistry(freePort)
cloud.prepareForDockerMultiplatformBuild([localRegistry],[cloud.getDockerIOMirrorRegistryConfig()], false)
// Generate the Dockerfile
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 22/47: fix settings.xml
Posted by ri...@apache.org.
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 150ba5191f1b00bf5fd419d0587bf28ea35a9d58
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Fri Nov 10 14:59:52 2023 +0100
fix settings.xml
---
modules/kogito-maven/3.8.x-rpm/maven/settings.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
index a4115138..bf67912d 100644
--- a/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
+++ b/modules/kogito-maven/3.8.x-rpm/maven/settings.xml
@@ -16,10 +16,12 @@
<profile>
<id>kogito-images</id>
+ <repositories>
<repository>
<id>apache-public-repository-group</id>
<name>Apache Public Repository Group</name>
<url>https://repository.apache.org/content/groups/public/</url>
+ <layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -37,6 +39,7 @@
<id>apache-public-repository-group</id>
<name>Apache Public Repository Group</name>
<url>https://repository.apache.org/content/groups/public/</url>
+ <layout>default</layout>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 12/47: env printout
Posted by ri...@apache.org.
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 b673b949f1a677996df15e7e26709dce3c939072
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 8 16:41:16 2023 +0100
env printout
---
.ci/jenkins/Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index a7c80858..16174a51 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -13,6 +13,7 @@ pipeline {
stage("Build&Test") {
steps {
script {
+ sh 'env'
List buildParams = []
buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${CHANGE_ID}: ${CHANGE_URL}"))
buildParams.add(string(name: "CHANGE_ID", value: CHANGE_ID))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 02/47: updated Jenkinsfile
Posted by ri...@apache.org.
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 7dde50ed95ddcaa9fa87cdd1c86f240b35e1ba2d
Author: radtriste <tr...@redhat.com>
AuthorDate: Tue Oct 17 10:48:36 2023 +0200
updated Jenkinsfile
---
.ci/jenkins/Jenkinsfile | 46 ++++++++++++++++++++++------------------------
1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 693fa00c..3bc37e89 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -2,7 +2,10 @@
pipeline {
agent {
- label 'ubuntu'
+ docker {
+ image env.AGENT_DOCKER_BUILDER_IMAGE
+ args env.AGENT_DOCKER_BUILDER_ARGS
+ }
}
options {
timeout(time: 120, unit: 'MINUTES')
@@ -11,45 +14,44 @@ pipeline {
stage('Initialization') {
steps {
script {
- clean()
-
sh 'printenv'
- githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true)
+ dir(getRepoName()) {
+ githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true)
+ }
}
}
}
stage('Validate CeKit Image and Modules descriptors') {
steps {
script {
- sh '''
- curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
- tar -xzvf cekit-image-validator-runner.tgz
- chmod +x cekit-image-validator-runner
- '''
- sh './cekit-image-validator-runner modules/'
- getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
+ dir(getRepoName()) {
+ sh '''
+ curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+ tar -xzvf cekit-image-validator-runner.tgz
+ chmod +x cekit-image-validator-runner
+ '''
+ sh './cekit-image-validator-runner modules/'
+ getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
+ }
}
}
}
stage('Build & Test Images') {
steps {
script {
- parallelStages = [:]
- for(String image : getImages()){
- parallelStages[image] = createBuildAndTestStageClosure(image)
+ dir(getRepoName()) {
+ parallelStages = [:]
+ for(String image : getImages()){
+ parallelStages[image] = createBuildAndTestStageClosure(image)
+ }
+ parallel parallelStages
}
- parallel parallelStages
}
}
}
}
post {
- always {
- script {
- clean()
- }
- }
unsuccessful {
script {
pullrequest.postComment(util.getMarkdownTestSummary('PR', "${BUILD_URL}", 'GITHUB'))
@@ -58,10 +60,6 @@ pipeline {
}
}
-void clean() {
- util.cleanNode()
-}
-
Closure createBuildAndTestStageClosure(String image) {
return {
stage("Build&Test ${image}") {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 26/47: adjust folder for tests
Posted by ri...@apache.org.
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 41dccfbfc4b0376ec9ca3f17a34dca758fba946c
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 15 11:35:09 2023 +0100
adjust folder for tests
---
tests/test-apps/clone-repo.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index 6433f055..4feb39f3 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -4,6 +4,7 @@
# if image name is supporting services, don't build it
IMAGE_NAME="$2"
KOGITO_EXAMPLES_REPO_NAME='incubator-kie-kogito-examples'
+KOGITO_EXAMPLES_FOLDER_NAME='kogito-examples' # many tests rely on location /tmp/kogito-examples
prod=""
if [ -n "${IMAGE_NAME}" ]; then
@@ -36,11 +37,10 @@ fi
set -e
# Clone examples
-KOGITO_EXAMPLES_DIR=/tmp/${KOGITO_EXAMPLES_REPO_NAME}
-cd /tmp
-rm -rf ${KOGITO_EXAMPLES_REPO_NAME}
-git clone https://github.com/apache/${KOGITO_EXAMPLES_REPO_NAME}.git
-cd ${KOGITO_EXAMPLES_REPO_NAME}/
+KOGITO_EXAMPLES_DIR=/tmp/${KOGITO_EXAMPLES_FOLDER_NAME}
+rm -rf ${KOGITO_EXAMPLES_DIR}
+git clone https://github.com/apache/${KOGITO_EXAMPLES_REPO_NAME}.git ${KOGITO_EXAMPLES_DIR}
+cd ${KOGITO_EXAMPLES_DIR}/
git fetch origin
git fetch origin --tags
git checkout -b nightly-main
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 38/47: add initial sleep into startup command in common-build-runtime tests
Posted by ri...@apache.org.
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 8a408907c622349c724ea692198ee72be378dc60
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Mon Nov 20 12:53:03 2023 +0100
add initial sleep into startup command in common-build-runtime tests
---
tests/features/common-build-runtime.feature | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/features/common-build-runtime.feature b/tests/features/common-build-runtime.feature
index 9a156850..fe3fc7cd 100644
--- a/tests/features/common-build-runtime.feature
+++ b/tests/features/common-build-runtime.feature
@@ -6,5 +6,5 @@
Feature: Common tests for Kogito builder and runtime images
Scenario: Verify if usage help is correctly called
- When container is started with command /home/kogito/kogito-app-launch.sh -h
+ When container is started with command bash -c "sleep 2s; /home/kogito/kogito-app-launch.sh -h"
Then container log should contain This is the
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 18/47: adjust repository URLs after transfer
Posted by ri...@apache.org.
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 <ja...@ibm.com>
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: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 28/47: small tweaks
Posted by ri...@apache.org.
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 03750868edc60af00cf5294088b296d4bb58d289
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 16 07:29:30 2023 +0100
small tweaks
---
.ci/jenkins/Jenkinsfile.build-image | 2 +-
scripts/build-kogito-apps-components.sh | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 2051bdab..889cb831 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -107,7 +107,7 @@ pipeline {
// Build multiplatform from generated Dockerfile
String squashMessage = "${getBuildImageName()}:${getImageVersion()} squashed"
dir('target/image') {
- cloud.dockerBuildMultiPlatformImages(getBuiltImageTag(), getImageBuildPlatforms(), shouldDeployImage(), squashMessage)
+ cloud.dockerBuildMultiPlatformImages(getBuiltImageTag(), getImageBuildPlatforms(), shouldDeployImage(), squashMessage, false, true)
}
}
}
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 486dda8c..9c77acbe 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -9,6 +9,7 @@ set -e
set -o pipefail
KOGITO_APPS_REPO_NAME="incubator-kie-kogito-apps"
+KOGITO_APPS_FOLDER_NAME="kogito-apps"
# Read entries before sourcing
imageName="${1}"
@@ -115,12 +116,13 @@ for ctx in ${contextDir}; do
cd ${build_target_dir}
echo "Using branch/tag ${gitBranch}, checking out. Temporary build dir is ${build_target_dir} and target dist is ${target_tmp_dir}"
- if [ ! -d "${build_target_dir}/${KOGITO_APPS_REPO_NAME}" ]; then
- git_command="git clone --single-branch --branch ${gitBranch} --depth 1 ${gitUri}"
+ KOGITO_APPS_DIR=${build_target_dir}/${KOGITO_APPS_FOLDER_NAME}
+ if [ ! -d "${KOGITO_APPS_DIR}" ]; then
+ git_command="git clone --single-branch --branch ${gitBranch} --depth 1 ${gitUri} ${KOGITO_APPS_DIR}"
echo "cloning ${KOGITO_APPS_REPO_NAME} with the following git command: ${git_command}"
eval ${git_command}
fi
- cd ${KOGITO_APPS_REPO_NAME} && echo "working dir `pwd`"
+ cd ${KOGITO_APPS_DIR} && echo "working dir `pwd`"
echo "Got MAVEN_OPTIONS = ${MAVEN_OPTIONS}"
mvn_command="mvn -am -pl ${ctx} package ${MAVEN_OPTIONS} -Dmaven.repo.local=${mvn_local_repo} -Dquarkus.container-image.build=false"
echo "Building component(s) ${contextDir} with the following maven command [${mvn_command}]"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 15/47: fix method name
Posted by ri...@apache.org.
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 1d5caeb6dcb61b434b256bf0ac84870b2e4cb1e7
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 9 08:48:16 2023 +0100
fix method name
---
.ci/jenkins/Jenkinsfile.build-and-test | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
index c17be2b1..36e426f5 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -20,7 +20,7 @@ pipeline {
dir(getRepoName()) {
// TODO Test pupose
deleteDir()
- githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorCredentialsTokenId(), usernamePassword: getGitAuthorCredentialsId()])
+ githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorTokenCredentialsId(), usernamePassword: getGitAuthorCredentialsId()])
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 39/47: use skopeo installed in image
Posted by ri...@apache.org.
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 eedae281c177795b01dc7ffccc144e71f3173288
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Mon Nov 20 17:56:37 2023 +0100
use skopeo installed in image
---
.ci/jenkins/Jenkinsfile.build-image | 2 --
1 file changed, 2 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 2cd1323a..37774e3b 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -118,8 +118,6 @@ pipeline {
}
steps {
script {
- cloud.installSkopeo()
-
// Make public if quay registry
if (getDeployImageRegistry() == QUAY_REGISTRY) {
String namespace = getDeployImageNamespace()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 30/47: tweak logs collection
Posted by ri...@apache.org.
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 ded1a4f76599704ed2e82f345ebe699bfa6c88b0
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 16 10:21:51 2023 +0100
tweak logs collection
---
.ci/jenkins/Jenkinsfile.build-image | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 2ba205f5..d1967bae 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -188,7 +188,7 @@ pipeline {
unstable "Testing error(s) for image ${getBuildImageName()}"
} finally {
junit testResults: 'target/**/*.xml', allowEmptyResults: true
- archiveArtifacts artifacts: 'target/**/*.xml, **/*-build.log', allowEmptyArchive: true
+ archiveArtifacts artifacts: 'target/**/*.xml', allowEmptyArchive: true
}
}
}
@@ -198,12 +198,17 @@ pipeline {
always {
script {
updateGithubCommitStatusFromBuildResult()
- archiveArtifacts artifacts: '**/*-build.log', allowEmptyArchive: true
+ collectContainerLogs()
+ archiveArtifacts artifacts: '**/*-build.log, **/*-container.log', allowEmptyArchive: true
}
}
}
}
+void collectContainerLogs() {
+ sh 'for container in $(docker container ls --format "{{.Names}}"); do docker logs $container >& ${container}-container.log; done'
+}
+
String getMakeBuildImageArgs() {
List args = []
if (getBuildKogitoAppsRef()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 19/47: adjust KOGITO_APPS_REPO_NAME
Posted by ri...@apache.org.
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 41088bc913b794ca50b85076725e3e04748a0ac2
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Fri Nov 10 12:50:34 2023 +0100
adjust KOGITO_APPS_REPO_NAME
---
scripts/build-kogito-apps-components.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/build-kogito-apps-components.sh b/scripts/build-kogito-apps-components.sh
index 2703cb5f..486dda8c 100755
--- a/scripts/build-kogito-apps-components.sh
+++ b/scripts/build-kogito-apps-components.sh
@@ -8,12 +8,12 @@
set -e
set -o pipefail
-KOGITO_APPS_REPO_NAME="kogito-apps"
+KOGITO_APPS_REPO_NAME="incubator-kie-kogito-apps"
# Read entries before sourcing
imageName="${1}"
gitBranch="${2:-main}"
-gitUri="${3:-https://github.com/apache/incubator-kie-kogito-apps.git}"
+gitUri="${3:-https://github.com/apache/${KOGITO_APPS_REPO_NAME}.git}"
contextDir=""
shift $#
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 24/47: set git config
Posted by ri...@apache.org.
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 8dc696b92921a3d4ef77b359bd5823d56877580c
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 15 09:37:39 2023 +0100
set git config
---
.ci/jenkins/Jenkinsfile.build-image | 1 +
1 file changed, 1 insertion(+)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 9c5aae68..3c867c0e 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -40,6 +40,7 @@ pipeline {
checkout(githubscm.resolveRepository(getRepoName(), getSourceAuthor(), getSourceBranch(), false, getGitAuthorCredentialsId()))
githubscm.prepareCommitStatusInformation(getRepoName(), getSourceAuthor(), getSourceBranch(), getGitAuthorCredentialsId())
}
+ githubscm.setUserConfig('robot', 'kie.apache.org')
updateGithubCommitStatus('PENDING', 'Started')
// Login to final registry if deploy is needed
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 36/47: fix bash
Posted by ri...@apache.org.
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 f393cabcd940ac03ce2969f697cc7287d28ba90d
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 16 16:15:45 2023 +0100
fix bash
---
.ci/jenkins/Jenkinsfile.build-image | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index f979091f..2cd1323a 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -199,7 +199,7 @@ pipeline {
script {
updateGithubCommitStatusFromBuildResult()
collectContainerLogs()
- archiveArtifacts artifacts: '**/*-build.log, **/containers.log', allowEmptyArchive: true
+ archiveArtifacts artifacts: '**/*-build.log, **/*.log', allowEmptyArchive: true
}
}
}
@@ -207,7 +207,7 @@ pipeline {
void collectContainerLogs() {
sh '''#!/bin/bash
- for container in $(docker container ls --format "{{.Names}}"); do echo "[$container:START]"; docker logs $container; echo "[$container:END]"; done' &> containers.log
+ for container in $(docker container ls --format "{{.Names}}"); do echo "[$container:START]"; docker logs $container; echo "[$container:END]"; done &> containers.log
'''
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 44/47: Fix problem with builder script copying files for swf-builder-image
Posted by ri...@apache.org.
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 1bad3b8f7e4f4abdbb2537ec30c73fadad38ce20
Author: Ricardo Zanini <za...@redhat.com>
AuthorDate: Tue Nov 21 15:24:47 2023 -0300
Fix problem with builder script copying files for swf-builder-image
Signed-off-by: Ricardo Zanini <za...@redhat.com>
---
kogito-swf-builder-image.yaml | 2 ++
.../kogito-swf/common/scripts/added/build-app.sh | 13 +++++++----
.../tests/bats/kogito-swf-builder-build-app.bats | 27 ++++++++++++++++++++++
.../resources/greet-with-inputschema/Dockerfile | 2 +-
4 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index 421d0448..4b9ed0be 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -21,6 +21,8 @@
packages:
manager: microdnf
+ install:
+ - rsync
- name: "quay.io/kiegroup/kogito-swf-builder"
from: "registry.access.redhat.com/ubi8/ubi-minimal:latest"
diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
index 762c791e..d570ffea 100755
--- a/modules/kogito-swf/common/scripts/added/build-app.sh
+++ b/modules/kogito-swf/common/scripts/added/build-app.sh
@@ -3,7 +3,7 @@ set -e
script_dir_path="$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)"
resources_path="$1"
-if [ ! -z "${resources_path}" ]; then
+if [ -n "${resources_path}" ]; then
resources_path="$(realpath "${resources_path}")"
fi
@@ -13,14 +13,17 @@ if [ "${SCRIPT_DEBUG}" = "true" ] ; then
set -x
export MAVEN_ARGS_APPEND="${MAVEN_ARGS_APPEND} -X --batch-mode"
log_info "Script debugging is enabled, allowing bash commands and their arguments to be printed as they are executed"
+ log_info "Resources path is ${resources_path}"
printenv
fi
# Copy resources if exists
-SUPPORTED_FILES=(".yaml" ".yml" ".json" ".properties" ".mvn/jvm.config")
log_info "-> Copying files from ${resources_path}, if any..."
-if [ ! -z "${resources_path}" ]; then
- cd "${resources_path}" && find . -regex '.*\.\(yaml\|yml\|json\|properties\)$' | sed 's|^./||' | xargs cp -v --parents -t "${swf_home_dir}"/src/main/resources/ && cd -
+if [ -n "${resources_path}" ]; then
+ destination="${KOGITO_HOME}/serverless-workflow-project/src/main/resources/"
+ cd "${resources_path}" &&
+ rsync -av --remove-source-files --prune-empty-dirs --progress --files-from <(find . -regex '.*\.(yaml|yml|json|properties)$' -type f) . "$destination" &&
+ cd -
find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
else
log_warning "-> Nothing to copy from ${resources_path}"
@@ -33,6 +36,8 @@ if [ ! -z "${QUARKUS_EXTENSIONS}" ]; then
${script_dir_path}/add-extension.sh "${QUARKUS_EXTENSIONS}" "true"
fi
+cd ${KOGITO_HOME}/serverless-workflow-project
+
"${MAVEN_HOME}"/bin/mvn -B ${MAVEN_ARGS_APPEND} \
-nsu \
-s "${MAVEN_SETTINGS_PATH}" \
diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
new file mode 100644
index 00000000..4fa64eff
--- /dev/null
+++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
@@ -0,0 +1,27 @@
+#!/usr/bin/env bats
+
+setup() {
+ export KOGITO_HOME=/tmp/kogito
+ export HOME="${KOGITO_HOME}"
+ mkdir -p "${KOGITO_HOME}"/launch
+ mkdir -p "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/
+ cp $BATS_TEST_DIRNAME/../../../../../kogito-logging/added/logging.sh "${KOGITO_HOME}"/launch/
+ cp $BATS_TEST_DIRNAME/../../added/jvm-settings.sh "${KOGITO_HOME}"/launch/
+ cp $BATS_TEST_DIRNAME/../../added/build-app.sh "${KOGITO_HOME}"/launch/
+}
+
+teardown() {
+ rm -rf "${KOGITO_HOME}"
+ rm -rf /tmp/resources
+}
+
+@test "verify copy resources is working" {
+ mkdir -p /tmp/resources
+ cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/kogito-swf-builder/resources/greet-with-inputschema/* /tmp/resources/
+
+ # 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 /tmp/resources/ || true
+
+ [[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/greet.sw.json ]]
+ [[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/schemas/input.json ]]
+}
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 88e1fc8a..a8e4bdd1 100644
--- a/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
+++ b/tests/shell/kogito-swf-builder/resources/greet-with-inputschema/Dockerfile
@@ -11,7 +11,7 @@ ARG MAVEN_DOWNLOAD_OUTPUT="true"
ARG MAVEN_OFFLINE_MODE="true"
# Copy from build context to resources directory
-COPY ./ ./resources/
+COPY * ./resources/
# Build app with given resources
RUN "${KOGITO_HOME}"/launch/build-app.sh './resources'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 03/47: update jenkinsfile
Posted by ri...@apache.org.
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 669d78096d02f7b64bfdffb96074087e79ad2c76
Author: radtriste <tr...@redhat.com>
AuthorDate: Tue Oct 17 11:06:52 2023 +0200
update jenkinsfile
---
.ci/jenkins/Jenkinsfile | 11 +++++++----
.ci/jenkins/Jenkinsfile.build-image | 37 ++++++++++++++++++-------------------
.ci/jenkins/Jenkinsfile.deploy | 18 ++++++------------
3 files changed, 31 insertions(+), 35 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 3bc37e89..f73926cb 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -17,7 +17,10 @@ pipeline {
sh 'printenv'
dir(getRepoName()) {
- githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true)
+ // githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorCredentialsId(), usernamePassword: 'kie-ci'])
+ // TODO Test pupose
+ deleteDir()
+ checkout(githubscm.resolveRepository('kogito-images', 'radtriste', 'fix_pipelines', false))
}
}
}
@@ -95,15 +98,15 @@ String[] getImages() {
}
String getChangeAuthor() {
- return env.ghprbAuthorRepoGitUrl ? util.getGroup(env.ghprbAuthorRepoGitUrl) : (env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR)
+ return CHANGE_AUTHOR
}
String getChangeBranch() {
- return env.ghprbSourceBranch ?: CHANGE_BRANCH
+ return CHANGE_BRANCH
}
String getChangeTarget() {
- return env.ghprbTargetBranch ?: CHANGE_TARGET
+ return CHANGE_TARGET
}
String getRepoName() {
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 81889abd..d3bdbcfd 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -18,8 +18,6 @@ pipeline {
CONTAINER_ENGINE = 'docker'
CONTAINER_ENGINE_TLS_OPTIONS = ''
- OPENSHIFT_API = credentials('OPENSHIFT_API')
- OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
OPENSHIFT_CREDS_KEY = 'OPENSHIFT_CREDS'
IMAGE_BUILD_PLATFORMS = 'linux/amd64,linux/arm64'
@@ -28,8 +26,6 @@ pipeline {
stage('Initialization') {
steps {
script {
- clean()
-
sh 'printenv'
assert getBuildImageName() : 'Please provide `BUILD_IMAGE_NAME` parameter'
@@ -49,7 +45,7 @@ pipeline {
// Login to final registry if deploy is needed
if (shouldDeployImage()) {
if (isDeployImageInOpenshiftRegistry()) {
- cloud.loginOpenShift(env.OPENSHIFT_API, env.OPENSHIFT_CREDS_KEY)
+ cloud.loginOpenShift(getOpenShiftAPI(), env.OPENSHIFT_CREDS_KEY)
cloud.loginOpenshiftRegistry(env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
} else if (getDeployImageRegistryCredentials()) {
cloud.loginContainerRegistry(getDeployImageRegistry(), getDeployImageRegistryCredentials(), env.CONTAINER_ENGINE, env.CONTAINER_ENGINE_TLS_OPTIONS ?: '')
@@ -199,24 +195,11 @@ pipeline {
always {
script {
updateGithubCommitStatusFromBuildResult()
-
- clean()
}
}
}
}
-void clean() {
- util.cleanNode(env.CONTAINER_ENGINE)
-
- cloud.cleanDockerMultiplatformBuild()
- cloud.cleanLocalRegistry()
- cloud.cleanSkopeo()
-
- // Clean Cekit cache, in case we reuse an old node
- sh "rm -rf \$HOME/.cekit/cache"
-}
-
String getMakeBuildImageArgs() {
List args = []
if (getBuildKogitoAppsRef()) {
@@ -261,7 +244,7 @@ String getDeployImageRegistryCredentials() {
}
String getDeployImageRegistry() {
- return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.DEPLOY_IMAGE_REGISTRY
+ return isDeployImageInOpenshiftRegistry() ? getOpenShiftRegistry() : params.DEPLOY_IMAGE_REGISTRY
}
String getDeployImageNamespace() {
@@ -292,6 +275,22 @@ boolean isDeployLatestTag() {
// utils
////////////////////////////////////////////////////////////////////////
+String getOpenShiftRegistry() {
+ String registry = ''
+ withCredentials([string(credentialsId: 'OPENSHIFT_REGISTRY', variable: 'OPENSHIFT_REGISTRY')]) {
+ registry = env.OPENSHIFT_REGISTRY
+ }
+ return registry
+}
+
+String getOpenShiftAPI() {
+ String openShiftAPI = ''
+ withCredentials([string(credentialsId: 'OPENSHIFT_API', variable: 'OPENSHIFT_API')]) {
+ openShiftAPI = env.OPENSHIFT_API
+ }
+ return openShiftAPI
+}
+
String getRepoName() {
return env.REPO_NAME
}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 00037337..4441c273 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -4,9 +4,9 @@ deployProperties = [:]
changesDone = false
-BUILT_IMAGES = []
-BUILD_FAILED_IMAGES = []
-TEST_FAILED_IMAGES = []
+BUILT_IMAGES = Collections.synchronizedList([])
+BUILD_FAILED_IMAGES = Collections.synchronizedList([])
+TEST_FAILED_IMAGES = Collections.synchronizedList([])
pipeline {
agent {
@@ -304,21 +304,15 @@ void createBuildAndTestStageClosure(String image) {
}
void registerBuiltImage(String imageName) {
- lock("${BUILD_URL} build success") {
- BUILT_IMAGES.add(imageName)
- }
+ BUILT_IMAGES.add(imageName)
}
void registerBuildFailedImage(String imageName) {
- lock("${BUILD_URL} build failed") {
- BUILD_FAILED_IMAGES.add(imageName)
- }
+ BUILD_FAILED_IMAGES.add(imageName)
}
void registerTestFailedImage(String imageName) {
- lock("${BUILD_URL} test failed") {
- TEST_FAILED_IMAGES.add(imageName)
- }
+ TEST_FAILED_IMAGES.add(imageName)
}
List getBuiltImages() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 42/47: yet another startup command change
Posted by ri...@apache.org.
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 93d9601ed90f77a2ec53b54232d58f876df55e5b
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Tue Nov 21 13:07:09 2023 +0100
yet another startup command change
---
tests/features/common-custom-truststore.feature | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/features/common-custom-truststore.feature b/tests/features/common-custom-truststore.feature
index 32d7a40d..005a9560 100644
--- a/tests/features/common-custom-truststore.feature
+++ b/tests/features/common-custom-truststore.feature
@@ -18,7 +18,7 @@
@openshift-serverless-1-tech-preview/logic-data-index-ephemeral-rhel8
Feature: Common tests for Custom TrustStore configuration
Scenario: Verify if a custom certificate is correctly handled
- When container is started with command /home/kogito/kogito-app-launch.sh
+ When container is started with command bash -c "sleep 2s; /home/kogito/kogito-app-launch.sh"
| variable | value |
| CUSTOM_TRUSTSTORE | my-truststore.jks |
| RUNTIME_TYPE | quarkus |
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 40/47: fix one feature file
Posted by ri...@apache.org.
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 3ec2764827b5746f8a56eebc04de02d9d307b21b
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Tue Nov 21 08:48:58 2023 +0100
fix one feature file
---
tests/features/common-dynamic-resources.feature | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/features/common-dynamic-resources.feature b/tests/features/common-dynamic-resources.feature
index 23ae6475..48d043e1 100644
--- a/tests/features/common-dynamic-resources.feature
+++ b/tests/features/common-dynamic-resources.feature
@@ -49,7 +49,7 @@ Feature: Common tests for Kogito images
And container log should match regex -Xmx512m
Scenario: Verify if Java Remote Debug is correctly configured
- When container is started with env
+ When container is started with args
| arg | value |
| command | bash -c "sleep 2s; /home/kogito/kogito-app-launch.sh" |
| env_json | {"SCRIPT_DEBUG":"true", "JAVA_DEBUG":"true", "JAVA_DEBUG_PORT":"9222"} |
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 25/47: set global config
Posted by ri...@apache.org.
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 d1bddd1a52d5bd520a3aab16e977c9a848585e4d
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 15 10:19:25 2023 +0100
set global config
---
.ci/jenkins/Jenkinsfile.build-image | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 3c867c0e..aa8202d6 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -40,7 +40,7 @@ pipeline {
checkout(githubscm.resolveRepository(getRepoName(), getSourceAuthor(), getSourceBranch(), false, getGitAuthorCredentialsId()))
githubscm.prepareCommitStatusInformation(getRepoName(), getSourceAuthor(), getSourceBranch(), getGitAuthorCredentialsId())
}
- githubscm.setUserConfig('robot', 'kie.apache.org')
+ githubscm.setUserConfig('robot', 'kie.apache.org', true)
updateGithubCommitStatus('PENDING', 'Started')
// Login to final registry if deploy is needed
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 31/47: replace mailing lists
Posted by ri...@apache.org.
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 ab4c84c8b987d373a22b9c485896a0bf666dab3d
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 16 10:22:14 2023 +0100
replace mailing lists
---
kogito-base-builder-image.yaml | 2 +-
kogito-data-index-ephemeral-image.yaml | 2 +-
kogito-data-index-infinispan-image.yaml | 2 +-
kogito-data-index-mongodb-image.yaml | 2 +-
kogito-data-index-oracle-image.yaml | 2 +-
kogito-data-index-postgresql-image.yaml | 2 +-
kogito-explainability-image.yaml | 2 +-
kogito-jit-runner-image.yaml | 2 +-
kogito-jobs-service-allinone-image.yaml | 2 +-
kogito-jobs-service-ephemeral-image.yaml | 2 +-
kogito-jobs-service-infinispan-image.yaml | 2 +-
kogito-jobs-service-mongodb-image.yaml | 2 +-
kogito-jobs-service-postgresql-image.yaml | 2 +-
kogito-management-console-image.yaml | 2 +-
kogito-runtime-jvm-image.yaml | 2 +-
kogito-runtime-native-image.yaml | 2 +-
kogito-s2i-builder-image.yaml | 2 +-
kogito-swf-builder-image.yaml | 2 +-
kogito-swf-devmode-image.yaml | 2 +-
kogito-task-console-image.yaml | 2 +-
kogito-trusty-infinispan-image.yaml | 2 +-
kogito-trusty-postgresql-image.yaml | 2 +-
kogito-trusty-redis-image.yaml | 2 +-
kogito-trusty-ui-image.yaml | 2 +-
logic-data-index-ephemeral-rhel8-image.yaml | 2 +-
logic-swf-builder-rhel8-image.yaml | 2 +-
logic-swf-devmode-rhel8-image.yaml | 2 +-
tests/features/data-index/kogito-data-index-ephemeral.feature | 2 +-
tests/features/data-index/kogito-data-index-infinispan.feature | 2 +-
tests/features/data-index/kogito-data-index-mongodb.feature | 2 +-
tests/features/data-index/kogito-data-index-oracle.feature | 2 +-
tests/features/data-index/kogito-data-index-postgresql.feature | 2 +-
tests/features/jobs-service/kogito-jobs-service-all-in-one.feature | 2 +-
tests/features/jobs-service/kogito-jobs-service-ephemeral.feature | 2 +-
tests/features/jobs-service/kogito-jobs-service-infinispan.feature | 2 +-
tests/features/jobs-service/kogito-jobs-service-mongodb.feature | 2 +-
tests/features/jobs-service/kogito-jobs-service-postgresql.feature | 2 +-
tests/features/kogito-explainability.feature | 2 +-
tests/features/kogito-jit-runner.feature | 2 +-
tests/features/kogito-management-console.feature | 2 +-
tests/features/kogito-runtime-jvm.feature | 2 +-
tests/features/kogito-runtime-native.feature | 2 +-
tests/features/kogito-s2i-builder.feature | 2 +-
tests/features/kogito-task-console.feature | 2 +-
.../openshift-serverless-logic/logic-data-index-ephemeral.feature | 2 +-
tests/features/openshift-serverless-logic/logic-swf-builder.feature | 2 +-
tests/features/openshift-serverless-logic/logic-swf-devmode.feature | 2 +-
tests/features/trusty/kogito-trusty-infinispan.feature | 2 +-
tests/features/trusty/kogito-trusty-postgresql.feature | 2 +-
tests/features/trusty/kogito-trusty-redis.feature | 2 +-
tests/features/trusty/kogito-trusty-ui.feature | 2 +-
51 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/kogito-base-builder-image.yaml b/kogito-base-builder-image.yaml
index a477a712..88be045b 100644
--- a/kogito-base-builder-image.yaml
+++ b/kogito-base-builder-image.yaml
@@ -17,7 +17,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Platform for building Kogito based on JDK and Maven"
- name: "io.k8s.display-name"
diff --git a/kogito-data-index-ephemeral-image.yaml b/kogito-data-index-ephemeral-image.yaml
index ca4d1a1b..00e9f723 100644
--- a/kogito-data-index-ephemeral-image.yaml
+++ b/kogito-data-index-ephemeral-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
- name: "io.k8s.display-name"
diff --git a/kogito-data-index-infinispan-image.yaml b/kogito-data-index-infinispan-image.yaml
index c0416aee..e8ebd312 100644
--- a/kogito-data-index-infinispan-image.yaml
+++ b/kogito-data-index-infinispan-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Data Index Service for Infinispan persistence provider"
- name: "io.k8s.display-name"
diff --git a/kogito-data-index-mongodb-image.yaml b/kogito-data-index-mongodb-image.yaml
index fd091fc5..ff9d55d6 100644
--- a/kogito-data-index-mongodb-image.yaml
+++ b/kogito-data-index-mongodb-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Data Index Service for Mongodb persistence provider"
- name: "io.k8s.display-name"
diff --git a/kogito-data-index-oracle-image.yaml b/kogito-data-index-oracle-image.yaml
index f4f544ae..af4c192d 100644
--- a/kogito-data-index-oracle-image.yaml
+++ b/kogito-data-index-oracle-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Data Index Service for Oracle persistence provider"
- name: "io.k8s.display-name"
diff --git a/kogito-data-index-postgresql-image.yaml b/kogito-data-index-postgresql-image.yaml
index 56ecf30f..e7ba4fb4 100644
--- a/kogito-data-index-postgresql-image.yaml
+++ b/kogito-data-index-postgresql-image.yaml
@@ -10,7 +10,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Data Index Service for PostgreSQL persistence provider"
- name: "io.k8s.display-name"
diff --git a/kogito-explainability-image.yaml b/kogito-explainability-image.yaml
index dab26f90..059c6685 100644
--- a/kogito-explainability-image.yaml
+++ b/kogito-explainability-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Explainability Service"
- name: "io.k8s.display-name"
diff --git a/kogito-jit-runner-image.yaml b/kogito-jit-runner-image.yaml
index 841a3103..423ac0ff 100644
--- a/kogito-jit-runner-image.yaml
+++ b/kogito-jit-runner-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito JIT Runner"
- name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-allinone-image.yaml b/kogito-jobs-service-allinone-image.yaml
index a83a110a..60c360fb 100644
--- a/kogito-jobs-service-allinone-image.yaml
+++ b/kogito-jobs-service-allinone-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Jobs Service with all available jdbc providers"
- name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-ephemeral-image.yaml b/kogito-jobs-service-ephemeral-image.yaml
index 497d8ef7..5975572e 100644
--- a/kogito-jobs-service-ephemeral-image.yaml
+++ b/kogito-jobs-service-ephemeral-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito in memory Jobs Service"
- name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-infinispan-image.yaml b/kogito-jobs-service-infinispan-image.yaml
index a772a679..5ab15692 100644
--- a/kogito-jobs-service-infinispan-image.yaml
+++ b/kogito-jobs-service-infinispan-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Jobs Service based on Infinispan"
- name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-mongodb-image.yaml b/kogito-jobs-service-mongodb-image.yaml
index 40577f65..d83a4584 100644
--- a/kogito-jobs-service-mongodb-image.yaml
+++ b/kogito-jobs-service-mongodb-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Jobs Service based on MongoDB"
- name: "io.k8s.display-name"
diff --git a/kogito-jobs-service-postgresql-image.yaml b/kogito-jobs-service-postgresql-image.yaml
index 98e2608b..56ea62d8 100644
--- a/kogito-jobs-service-postgresql-image.yaml
+++ b/kogito-jobs-service-postgresql-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Jobs Service based on Postgresql"
- name: "io.k8s.display-name"
diff --git a/kogito-management-console-image.yaml b/kogito-management-console-image.yaml
index f604fdfa..3a4de549 100644
--- a/kogito-management-console-image.yaml
+++ b/kogito-management-console-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Management Console, manage your Business Process easily."
- name: "io.k8s.display-name"
diff --git a/kogito-runtime-jvm-image.yaml b/kogito-runtime-jvm-image.yaml
index 245c42db..8871487f 100644
--- a/kogito-runtime-jvm-image.yaml
+++ b/kogito-runtime-jvm-image.yaml
@@ -17,7 +17,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito based on Quarkus or Spring Boot JVM image"
- name: "io.k8s.display-name"
diff --git a/kogito-runtime-native-image.yaml b/kogito-runtime-native-image.yaml
index 56412886..62139b82 100644
--- a/kogito-runtime-native-image.yaml
+++ b/kogito-runtime-native-image.yaml
@@ -17,7 +17,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito based on Quarkus native image"
- name: "io.k8s.display-name"
diff --git a/kogito-s2i-builder-image.yaml b/kogito-s2i-builder-image.yaml
index a947f4f7..7c4b288a 100644
--- a/kogito-s2i-builder-image.yaml
+++ b/kogito-s2i-builder-image.yaml
@@ -17,7 +17,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Platform for building Kogito based on Quarkus or Spring Boot"
- name: "io.k8s.display-name"
diff --git a/kogito-swf-builder-image.yaml b/kogito-swf-builder-image.yaml
index ee6b1d68..421d0448 100644
--- a/kogito-swf-builder-image.yaml
+++ b/kogito-swf-builder-image.yaml
@@ -37,7 +37,7 @@
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled."
- name: "io.k8s.display-name"
diff --git a/kogito-swf-devmode-image.yaml b/kogito-swf-devmode-image.yaml
index 7c647a71..2503a869 100644
--- a/kogito-swf-devmode-image.yaml
+++ b/kogito-swf-devmode-image.yaml
@@ -33,7 +33,7 @@
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Kogito Serverless Workflow base builder with Quarkus extensions libraries preinstalled."
- name: "io.k8s.display-name"
diff --git a/kogito-task-console-image.yaml b/kogito-task-console-image.yaml
index 18ca8eab..d4a0d1a0 100644
--- a/kogito-task-console-image.yaml
+++ b/kogito-task-console-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Task Console, manage your Business Process easily."
- name: "io.k8s.display-name"
diff --git a/kogito-trusty-infinispan-image.yaml b/kogito-trusty-infinispan-image.yaml
index 5e4807d8..0fcec594 100644
--- a/kogito-trusty-infinispan-image.yaml
+++ b/kogito-trusty-infinispan-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Trusty Service for Infinispan persistence provider"
- name: "io.k8s.display-name"
diff --git a/kogito-trusty-postgresql-image.yaml b/kogito-trusty-postgresql-image.yaml
index d0e14256..6f8848df 100644
--- a/kogito-trusty-postgresql-image.yaml
+++ b/kogito-trusty-postgresql-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Trusty Service for PostgreSQL persistence provider"
- name: "io.k8s.display-name"
diff --git a/kogito-trusty-redis-image.yaml b/kogito-trusty-redis-image.yaml
index 0964ab65..eb5bfc69 100644
--- a/kogito-trusty-redis-image.yaml
+++ b/kogito-trusty-redis-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Trusty Service for Redis persistence provider"
- name: "io.k8s.display-name"
diff --git a/kogito-trusty-ui-image.yaml b/kogito-trusty-ui-image.yaml
index b5d41494..0386231f 100644
--- a/kogito-trusty-ui-image.yaml
+++ b/kogito-trusty-ui-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "org.kie.kogito.version"
value: "2.0.0-SNAPSHOT"
- name: "maintainer"
- value: "kogito <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Runtime image for Kogito Trusty UI, manage your Business Process easily."
- name: "io.k8s.display-name"
diff --git a/logic-data-index-ephemeral-rhel8-image.yaml b/logic-data-index-ephemeral-rhel8-image.yaml
index 0d89e1d8..9e7bf634 100644
--- a/logic-data-index-ephemeral-rhel8-image.yaml
+++ b/logic-data-index-ephemeral-rhel8-image.yaml
@@ -9,7 +9,7 @@ labels:
- name: "com.redhat.component"
value: "openshift-serverless-1-logic-data-index-ephemeral-rhel8-container"
- name: "maintainer"
- value: "serverless-logic <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider"
- name: "io.k8s.display-name"
diff --git a/logic-swf-builder-rhel8-image.yaml b/logic-swf-builder-rhel8-image.yaml
index 10100c29..ad674d6b 100644
--- a/logic-swf-builder-rhel8-image.yaml
+++ b/logic-swf-builder-rhel8-image.yaml
@@ -16,7 +16,7 @@ labels:
- name: "com.redhat.component"
value: "openshift-serverless-1-logic-swf-builder-rhel8-container"
- name: "maintainer"
- value: "serverless-logic <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
- name: "io.k8s.description"
value: "Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled"
- name: "io.k8s.display-name"
diff --git a/logic-swf-devmode-rhel8-image.yaml b/logic-swf-devmode-rhel8-image.yaml
index c240e71e..88e6e4e9 100644
--- a/logic-swf-devmode-rhel8-image.yaml
+++ b/logic-swf-devmode-rhel8-image.yaml
@@ -20,7 +20,7 @@ labels:
- name: "com.redhat.component"
value: "openshift-serverless-1-logic-swf-devmode-rhel8-container"
- name: "maintainer"
- value: "serverless-logic <bs...@redhat.com>"
+ value: "Apache KIE <de...@kie.apache.org>"
modules:
repositories:
diff --git a/tests/features/data-index/kogito-data-index-ephemeral.feature b/tests/features/data-index/kogito-data-index-ephemeral.feature
index a57d1941..965bad01 100644
--- a/tests/features/data-index/kogito-data-index-ephemeral.feature
+++ b/tests/features/data-index/kogito-data-index-ephemeral.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index ephemeral postgresql feature.
Scenario: verify if all labels are correctly set on kogito-data-index-ephemeral image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
And the image should contain label io.k8s.display-name with value Kogito Data Index Service - ephemeral PostgreSQL
diff --git a/tests/features/data-index/kogito-data-index-infinispan.feature b/tests/features/data-index/kogito-data-index-infinispan.feature
index a33e5ac8..39953074 100644
--- a/tests/features/data-index/kogito-data-index-infinispan.feature
+++ b/tests/features/data-index/kogito-data-index-infinispan.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index infinispan feature.
Scenario: verify if all labels are correctly set on kogito-data-index-infinispan image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Infinispan persistence provider
And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Infinispan
diff --git a/tests/features/data-index/kogito-data-index-mongodb.feature b/tests/features/data-index/kogito-data-index-mongodb.feature
index d130b8c4..10578dc9 100644
--- a/tests/features/data-index/kogito-data-index-mongodb.feature
+++ b/tests/features/data-index/kogito-data-index-mongodb.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index mongodb feature.
Scenario: verify if all labels are correctly set on kogito-data-index-mongodb image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Mongodb persistence provider
And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Mongodb
diff --git a/tests/features/data-index/kogito-data-index-oracle.feature b/tests/features/data-index/kogito-data-index-oracle.feature
index c24c3969..9cac42d0 100644
--- a/tests/features/data-index/kogito-data-index-oracle.feature
+++ b/tests/features/data-index/kogito-data-index-oracle.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index oracle feature.
Scenario: verify if all labels are correctly set on kogito-data-index-oracle image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for Oracle persistence provider
And the image should contain label io.k8s.display-name with value Kogito Data Index Service - Oracle
diff --git a/tests/features/data-index/kogito-data-index-postgresql.feature b/tests/features/data-index/kogito-data-index-postgresql.feature
index ddd0b761..2d3a1da7 100644
--- a/tests/features/data-index/kogito-data-index-postgresql.feature
+++ b/tests/features/data-index/kogito-data-index-postgresql.feature
@@ -3,7 +3,7 @@ Feature: Kogito-data-index postgresql feature.
Scenario: verify if all labels are correctly set on kogito-data-index-postgresql image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Data Index Service for PostgreSQL persistence provider
And the image should contain label io.k8s.display-name with value Kogito Data Index Service - PostgreSQL
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 3693143e..636c458f 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
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-all-in-one feature.
Scenario: verify if all labels are correctly set kogito-jobs-service image image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service with all available jdbc providers
And the image should contain label io.k8s.display-name with value Kogito Jobs Service All-in-One
diff --git a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
index 53cd99f1..a6658a4b 100644
--- a/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-ephemeral.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-ephemeral feature.
Scenario: verify if all labels are correctly set kogito-jobs-service image image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito in memory Jobs Service
And the image should contain label io.k8s.display-name with value Kogito in memory Jobs Service
diff --git a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
index 68412264..3c235a53 100644
--- a/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-infinispan.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-infinispan feature.
Scenario: verify if all labels are correctly set kogito-jobs-service image image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Infinispan
And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Infinispan
diff --git a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
index 277e8260..3642f616 100644
--- a/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-mongodb.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-mongodb feature.
Scenario: verify if all labels are correctly set kogito-jobs-service image image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on MongoDB
And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on MongoDB
diff --git a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
index bb05ad25..2b89a280 100644
--- a/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
+++ b/tests/features/jobs-service/kogito-jobs-service-postgresql.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jobs-service-postgresql feature.
Scenario: verify if all labels are correctly set kogito-jobs-service image image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Jobs Service based on Postgresql
And the image should contain label io.k8s.display-name with value Kogito Jobs Service based on Postgresql
diff --git a/tests/features/kogito-explainability.feature b/tests/features/kogito-explainability.feature
index b7a75697..ba997ebd 100644
--- a/tests/features/kogito-explainability.feature
+++ b/tests/features/kogito-explainability.feature
@@ -3,7 +3,7 @@ Feature: Kogito-explainability feature.
Scenario: verify if all labels are correctly set on kogito-explainability image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Explainability Service
And the image should contain label io.k8s.display-name with value Kogito Explainability Service
diff --git a/tests/features/kogito-jit-runner.feature b/tests/features/kogito-jit-runner.feature
index a38ada64..bb5b21e4 100644
--- a/tests/features/kogito-jit-runner.feature
+++ b/tests/features/kogito-jit-runner.feature
@@ -3,7 +3,7 @@ Feature: Kogito-jit-runner feature.
Scenario: verify if all labels are correctly set on kogito-jit-runner image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito JIT Runner
And the image should contain label io.k8s.display-name with value Kogito JIT Runner
diff --git a/tests/features/kogito-management-console.feature b/tests/features/kogito-management-console.feature
index 7be4652c..ad3aaef7 100644
--- a/tests/features/kogito-management-console.feature
+++ b/tests/features/kogito-management-console.feature
@@ -3,7 +3,7 @@ Feature: kogito-management-console feature
Scenario: verify if all labels are correctly set kogito-management-console image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Management Console, manage your Business Process easily.
And the image should contain label io.k8s.display-name with value Kogito Management Console
diff --git a/tests/features/kogito-runtime-jvm.feature b/tests/features/kogito-runtime-jvm.feature
index ed130238..98732c80 100644
--- a/tests/features/kogito-runtime-jvm.feature
+++ b/tests/features/kogito-runtime-jvm.feature
@@ -3,7 +3,7 @@ Feature: kogito-runtime-jvm feature.
Scenario: verify if all labels are correctly set on kogito-runtime-jvm image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
And the image should contain label io.openshift.s2i.destination with value /tmp
And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-runtime-native.feature b/tests/features/kogito-runtime-native.feature
index 1cf48122..314881ab 100644
--- a/tests/features/kogito-runtime-native.feature
+++ b/tests/features/kogito-runtime-native.feature
@@ -3,7 +3,7 @@ Feature: Kogito-runtime-native feature.
Scenario: verify if all labels are correctly set on kogito-runtime-native image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
And the image should contain label io.openshift.s2i.destination with value /tmp
And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-s2i-builder.feature b/tests/features/kogito-s2i-builder.feature
index 290b44cb..fe1cbfb8 100644
--- a/tests/features/kogito-s2i-builder.feature
+++ b/tests/features/kogito-s2i-builder.feature
@@ -3,7 +3,7 @@ Feature: kogito-s2i-builder image tests
Scenario: verify if all labels are correctly set on kogito-s2i-builder image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.s2i.scripts-url with value image:///usr/local/s2i
And the image should contain label io.openshift.s2i.destination with value /tmp
And the image should contain label io.openshift.expose-services with value 8080:http
diff --git a/tests/features/kogito-task-console.feature b/tests/features/kogito-task-console.feature
index 86ce99f7..78ba0376 100644
--- a/tests/features/kogito-task-console.feature
+++ b/tests/features/kogito-task-console.feature
@@ -3,7 +3,7 @@ Feature: kogito-task-console feature
Scenario: verify if all labels are correctly set on kogito-task-console image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Task Console, manage your Business Process easily.
And the image should contain label io.k8s.display-name with value Kogito Task Console
diff --git a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
index 147918c4..6f62ba9e 100644
--- a/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
+++ b/tests/features/openshift-serverless-logic/logic-data-index-ephemeral.feature
@@ -4,7 +4,7 @@ Feature: logic-data-index-ephemeral-rhel8 feature
Scenario: verify if all labels are correctly set on logic-data-index-ephemeral-rhel8 image
Given image is built
Then the image should contain label io.openshift.expose-services with value 8080:http
- And the image should contain label maintainer with value serverless-logic <bs...@redhat.com>
+ And the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Data Index Service for ephemeral PostgreSQL persistence provider
And the image should contain label io.k8s.display-name with value Red Hat build of Kogito Data Index Service - ephemeral PostgreSQL
And the image should contain label io.openshift.tags with value logic-data-index,kogito,data-index,data-index-ephemeral
diff --git a/tests/features/openshift-serverless-logic/logic-swf-builder.feature b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
index 4982cb88..8d1f847c 100644
--- a/tests/features/openshift-serverless-logic/logic-swf-builder.feature
+++ b/tests/features/openshift-serverless-logic/logic-swf-builder.feature
@@ -4,7 +4,7 @@ Feature: logic-swf-builder-rhel8 feature
Scenario: verify if all labels are correctly set on logic-swf-builder-rhel8 image
Given image is built
Then the image should contain label io.openshift.expose-services with value 8080:http
- And the image should contain label maintainer with value serverless-logic <bs...@redhat.com>
+ And the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.k8s.description with value Red Hat build of Runtime image for Kogito Serverless Workflow builder with Quarkus extensions libraries preinstalled
And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic Builder image
And the image should contain label io.openshift.tags with value logic-swf-builder,kogito,swf-builder
diff --git a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
index a69f5d16..e67a7c51 100644
--- a/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
+++ b/tests/features/openshift-serverless-logic/logic-swf-devmode.feature
@@ -4,7 +4,7 @@ Feature: logic-swf-devmode-rhel8 feature
Scenario: verify if all labels are correctly set on logic-swf-devmode-rhel8 image
Given image is built
Then the image should contain label io.openshift.expose-services with value 8080:http,5005:http
- And the image should contain label maintainer with value serverless-logic <bs...@redhat.com>
+ And the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.k8s.description with value Red Hat build of Kogito Serverless Workflow development mode image with Quarkus extensions libraries preinstalled.
And the image should contain label io.k8s.display-name with value Red Hat OpenShift Serverless Logic SWF Devmode
And the image should contain label io.openshift.tags with value logic,devmode,kogito,kogito,development,serverless,workflow
diff --git a/tests/features/trusty/kogito-trusty-infinispan.feature b/tests/features/trusty/kogito-trusty-infinispan.feature
index a5d8d140..dbf213ec 100644
--- a/tests/features/trusty/kogito-trusty-infinispan.feature
+++ b/tests/features/trusty/kogito-trusty-infinispan.feature
@@ -3,7 +3,7 @@ Feature: Kogito-trusty infinispan feature.
Scenario: verify if all labels are correctly set on kogito-trusty-infinispan image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Infinispan persistence provider
And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Infinispan
diff --git a/tests/features/trusty/kogito-trusty-postgresql.feature b/tests/features/trusty/kogito-trusty-postgresql.feature
index 829f255e..a2224fbc 100644
--- a/tests/features/trusty/kogito-trusty-postgresql.feature
+++ b/tests/features/trusty/kogito-trusty-postgresql.feature
@@ -3,7 +3,7 @@ Feature: Kogito-trusty postgresql feature.
Scenario: verify if all labels are correctly set on kogito-trusty-postgresql image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for PostgreSQL persistence provider
And the image should contain label io.k8s.display-name with value Kogito Trusty Service - PostgreSQL
diff --git a/tests/features/trusty/kogito-trusty-redis.feature b/tests/features/trusty/kogito-trusty-redis.feature
index a093a886..f39b831e 100644
--- a/tests/features/trusty/kogito-trusty-redis.feature
+++ b/tests/features/trusty/kogito-trusty-redis.feature
@@ -3,7 +3,7 @@ Feature: Kogito-trusty redis feature.
Scenario: verify if all labels are correctly set on kogito-trusty-redis image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty Service for Redis persistence provider
And the image should contain label io.k8s.display-name with value Kogito Trusty Service - Redis
diff --git a/tests/features/trusty/kogito-trusty-ui.feature b/tests/features/trusty/kogito-trusty-ui.feature
index 3d1e875d..1aa3a978 100644
--- a/tests/features/trusty/kogito-trusty-ui.feature
+++ b/tests/features/trusty/kogito-trusty-ui.feature
@@ -3,7 +3,7 @@ Feature: kogito-trusty-ui feature
Scenario: verify if all labels are correctly set on kogito-trusty-ui image
Given image is built
- Then the image should contain label maintainer with value kogito <bs...@redhat.com>
+ Then the image should contain label maintainer with value Apache KIE <de...@kie.apache.org>
And the image should contain label io.openshift.expose-services with value 8080:http
And the image should contain label io.k8s.description with value Runtime image for Kogito Trusty UI, manage your Business Process easily.
And the image should contain label io.k8s.display-name with value Kogito Trusty UI
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 01/47: Fix pipelines
Posted by ri...@apache.org.
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 4e602316a400f55cee2a0428b06a742c1030bcad
Author: radtriste <tr...@redhat.com>
AuthorDate: Tue Oct 17 10:43:52 2023 +0200
Fix pipelines
---
.ci/jenkins/Jenkinsfile.build-image | 8 +-
.ci/jenkins/Jenkinsfile.deploy | 160 ++++++++++++++++++-----------------
.ci/jenkins/Jenkinsfile.setup-branch | 2 +-
.ci/jenkins/dsl/jobs.groovy | 2 +-
Makefile | 6 +-
scripts/README.md | 4 +-
scripts/common.py | 2 +-
scripts/list-images.py | 2 +-
scripts/manage-kogito-version.py | 2 +-
scripts/push-local-registry.sh | 2 +-
scripts/push-staging.py | 2 +-
scripts/retrieve_version.py | 4 +-
scripts/update-repository.py | 4 +-
tests/test-apps/clone-repo.sh | 2 +-
14 files changed, 102 insertions(+), 100 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index f13a6404..81889abd 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -67,12 +67,12 @@ pipeline {
env.MAVEN_MIRROR_URL = env.MAVEN_MIRROR_REPOSITORY
// Ignore self-signed certificates if MAVEN_MIRROR_URL is defined
- runPythonCommand("python3 scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
+ runPythonCommand("python scripts/update-repository.py --build-maven-mirror-url ${MAVEN_MIRROR_URL} --ignore-self-signed-cert")
}
if (getMavenArtifactRepository()) {
echo "Setup Repository url to '${getMavenArtifactRepository()}'"
- runPythonCommand("python3 scripts/update-repository.py --repo-url ${getMavenArtifactRepository()}")
+ runPythonCommand("python scripts/update-repository.py --repo-url ${getMavenArtifactRepository()}")
}
}
}
@@ -89,7 +89,7 @@ pipeline {
// echo "[WARN] Artifacts repository defined in env will override the quarkus platform URL in tests. Make sure the platform artifacts are available on that artifacts repository (you can use a maven group)"
// }
// // Setup quarkus platform repo configuration
- // runPythonCommand("python3 scripts/update-repository.py --repo-url ${getQuarkusPlatformURL()} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
+ // runPythonCommand("python scripts/update-repository.py --repo-url ${getQuarkusPlatformURL()} --ignore-self-signed-cert --quarkus-platform-version ${quarkusPlatformVersion}")
// }
// }
// }
@@ -153,7 +153,7 @@ pipeline {
}
steps {
script {
- updateTestsCommand = 'python3 scripts/update-repository.py --tests-only'
+ updateTestsCommand = 'python scripts/update-repository.py --tests-only'
updateTestsCommand += getMavenArtifactRepository() ? " --repo-url ${getMavenArtifactRepository()}" : ''
updateTestsCommand += getTestsKogitoExamplesRef() ? " --examples-ref ${getTestsKogitoExamplesRef()}" : ''
updateTestsCommand += getTestsKogitoExamplesURI() ? " --examples-uri ${getTestsKogitoExamplesURI()}" : ''
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 83697af7..00037337 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -14,27 +14,25 @@ pipeline {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
}
- }
+ }
options {
- timeout(time: 120, unit: 'MINUTES')
+ timeout(time: 240, unit: 'MINUTES')
}
environment {
KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
-
- OPENSHIFT_REGISTRY = credentials('OPENSHIFT_REGISTRY')
}
stages {
stage('Initialization') {
steps {
script {
- clean()
-
currentBuild.displayName = params.DISPLAY_NAME ?: currentBuild.displayName
- checkoutRepo()
+ dir(getRepoName()) {
+ checkoutRepo()
+ }
if (isRelease()) {
// Verify version is set and if on right release branch
@@ -62,10 +60,12 @@ pipeline {
}
steps {
script {
- if (githubscm.isBranchExist('origin',getPRBranch())) {
- githubscm.removeRemoteBranch('origin', getPRBranch())
+ dir(getRepoName()) {
+ if (githubscm.isBranchExist('origin',getPRBranch())) {
+ githubscm.removeRemoteBranch('origin', getPRBranch())
+ }
+ githubscm.createBranch(getPRBranch())
}
- githubscm.createBranch(getPRBranch())
}
}
}
@@ -76,12 +76,14 @@ pipeline {
}
steps {
script {
- if (getQuarkusPlatformVersion()) {
- runPythonCommand("python3 scripts/update-repository.py --quarkus-platform-version ${getQuarkusPlatformVersion()}")
+ dir(getRepoName()) {
+ if (getQuarkusPlatformVersion()) {
+ sh "python scripts/update-repository.py --quarkus-platform-version ${getQuarkusPlatformVersion()}"
- commitAndPushChanges("Update Quarkus Platform version to ${getQuarkusPlatformVersion()}")
- } else {
- echo 'No new quarkus version given for the release. Statu quo ...'
+ commitAndPushChanges("Update Quarkus Platform version to ${getQuarkusPlatformVersion()}")
+ } else {
+ echo 'No new quarkus version given for the release. Statu quo ...'
+ }
}
}
}
@@ -93,16 +95,18 @@ pipeline {
}
steps {
script {
- versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
- if (getBuildBranch() != 'main') {
- versionCmd += " --examples-ref ${!isRelease() ? 'nightly-' : ''}${getBuildBranch()}"
- }
- if (getKogitoArtifactsVersion()) {
- versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
- }
- runPythonCommand(versionCmd)
+ dir(getRepoName()) {
+ versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getProjectVersion()} --confirm"
+ if (getBuildBranch() != 'main') {
+ versionCmd += " --examples-ref ${!isRelease() ? 'nightly-' : ''}${getBuildBranch()}"
+ }
+ if (getKogitoArtifactsVersion()) {
+ versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
+ }
+ sh versionCmd
- commitAndPushChanges("Update project version to ${getProjectVersion()}")
+ commitAndPushChanges("Update project version to ${getProjectVersion()}")
+ }
}
}
}
@@ -110,18 +114,15 @@ pipeline {
stage('Validate CeKit Image and Modules descriptors') {
steps {
script {
- sh '''
- curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
- tar -xzvf cekit-image-validator-runner.tgz
- chmod +x cekit-image-validator-runner
- '''
- sh './cekit-image-validator-runner modules/'
- getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
- }
- }
- post {
- always {
- sh 'rm -rf cekit-image-validator-runner*'
+ dir(getRepoName()) {
+ sh '''
+ curl -Ls https://github.com/kiegroup/kie-cloud-tools/releases/download/v1.3.6/cekit-image-validator-runner.tgz --output cekit-image-validator-runner.tgz
+ tar -xzvf cekit-image-validator-runner.tgz
+ chmod +x cekit-image-validator-runner
+ '''
+ sh './cekit-image-validator-runner modules/'
+ getImages().each { image -> sh "./cekit-image-validator-runner ${image}-image.yaml" }
+ }
}
}
}
@@ -129,11 +130,13 @@ pipeline {
stage('Build, Push & Test Images') {
steps {
script {
- parallelStages = [:]
- getImages().each { image ->
- parallelStages["Build&Test ${image}"] = createBuildAndTestStageClosure(image)
+ dir(getRepoName()) {
+ parallelStages = [:]
+ getImages().each { image ->
+ parallelStages["Build&Test ${image}"] = createBuildAndTestStageClosure(image)
+ }
+ parallel parallelStages
}
- parallel parallelStages
}
}
post {
@@ -159,37 +162,39 @@ pipeline {
}
steps {
script {
- def commitMsg = "[${getBuildBranch()}] Update Maven artifacts"
- def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}."
- if (isRelease()) {
- commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()}"
- prBody += '\nPlease do not merge, it should be merged automatically.'
- } else if (currentBuild.currentResult != 'SUCCESS') {
- commitMsg += " (${currentBuild.currentResult})"
- prBody += '\n\nSuccessful images:\n'
- getBuiltImages().each {
- prBody += "- ${it}\n"
- }
- if (getBuildFailedImages()) {
- prBody += '\nBuild failures on those images:\n'
- getBuildFailedImages().each {
+ dir(getRepoName()) {
+ def commitMsg = "[${getBuildBranch()}] Update Maven artifacts"
+ def prBody = "Generated by build ${BUILD_TAG}: ${BUILD_URL}."
+ if (isRelease()) {
+ commitMsg = "[${getBuildBranch()}] Update project version to ${getProjectVersion()}"
+ prBody += '\nPlease do not merge, it should be merged automatically.'
+ } else if (currentBuild.currentResult != 'SUCCESS') {
+ commitMsg += " (${currentBuild.currentResult})"
+ prBody += '\n\nSuccessful images:\n'
+ getBuiltImages().each {
prBody += "- ${it}\n"
}
- } else {
- prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
- }
- if (getTestFailedImages()) {
- prBody += '\nTest failures on those images:\n'
- getTestFailedImages().each {
- prBody += "- ${it}\n"
+ if (getBuildFailedImages()) {
+ prBody += '\nBuild failures on those images:\n'
+ getBuildFailedImages().each {
+ prBody += "- ${it}\n"
+ }
+ } else {
+ prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
}
- } else {
- prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
+ if (getTestFailedImages()) {
+ prBody += '\nTest failures on those images:\n'
+ getTestFailedImages().each {
+ prBody += "- ${it}\n"
+ }
+ } else {
+ prBody += '\nImages were all successfully built but some other problem occured in the pipeline execution...\n'
+ }
+ prBody += '\nSee build url above for more information'
}
- prBody += '\nSee build url above for more information'
+ String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getGitAuthorCredsID())
+ deployProperties["${getRepoName()}.pr.link"] = prLink
}
- String prLink = githubscm.createPR(commitMsg, prBody, getBuildBranch(), getGitAuthorCredsID())
- deployProperties["${getRepoName()}.pr.link"] = prLink
}
}
post {
@@ -224,9 +229,6 @@ pipeline {
unsuccessful {
sendUnsuccessfulNotification()
}
- cleanup {
- clean()
- }
}
}
@@ -259,10 +261,6 @@ void commitAndPushChanges(String commitMsg) {
changesDone = true
}
-void clean() {
- util.cleanNode()
-}
-
void createBuildAndTestStageClosure(String image) {
return {
stage("Build&Test ${image}") {
@@ -348,7 +346,7 @@ String getDeployImageRegistryCredentials() {
}
String getDeployImageRegistry() {
- return isDeployImageInOpenshiftRegistry() ? env.OPENSHIFT_REGISTRY : params.IMAGE_REGISTRY
+ return isDeployImageInOpenshiftRegistry() ? getOpenShiftRegistry() : params.IMAGE_REGISTRY
}
String getDeployImageNamespace() {
return isDeployImageInOpenshiftRegistry() ? 'openshift' : params.IMAGE_NAMESPACE
@@ -404,6 +402,14 @@ String getKogitoArtifactsVersion() {
return params.KOGITO_ARTIFACTS_VERSION
}
+String getOpenShiftRegistry() {
+ String registry = ''
+ withCredentials([string(credentialsId: 'OPENSHIFT_REGISTRY', variable: 'OPENSHIFT_REGISTRY')]) {
+ registry = env.OPENSHIFT_REGISTRY
+ }
+ return registry
+}
+
void setDeployPropertyIfNeeded(String key, def value) {
if (value) {
deployProperties[key] = value
@@ -414,11 +420,7 @@ String[] getImages() {
if (env.IMAGES_LIST) {
return env.IMAGES_LIST.split(',')
}
- return runPythonCommand("make list | tr '\\n' ','", true).trim().split(',')
-}
-
-void runPythonCommand(String cmd, boolean stdout = false) {
- return sh(returnStdout: stdout, script: cmd)
+ return sh(returnStdout: true, script: "make list | tr '\\n' ','").trim().split(',')
}
String getQuarkusPlatformVersion() {
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
index 182689cb..17c2ffb7 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -35,7 +35,7 @@ pipeline {
steps {
script {
dir(getRepoName()) {
- versionCmd = "python3 scripts/manage-kogito-version.py --bump-to ${getKogitoVersion()} --confirm"
+ versionCmd = "python scripts/manage-kogito-version.py --bump-to ${getKogitoVersion()} --confirm"
versionCmd += " --examples-ref nightly-${getBuildBranch()}"
if (getKogitoArtifactsVersion()) {
versionCmd += " --artifacts-version ${getKogitoArtifactsVersion()}"
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index fb18ed05..8e533131 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -256,6 +256,6 @@ void setupPromoteJob(JobType jobType) {
void setupQuarkusUpdateJob() {
KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
- "source ~/virtenvs/cekit/bin/activate && python3 scripts/update-repository.py --quarkus-platform-version %new_version%"
+ "python scripts/update-repository.py --quarkus-platform-version %new_version%"
])
}
diff --git a/Makefile b/Makefile
index 4e2b4657..150a74a6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-IMAGE_VERSION := $(shell python3 scripts/retrieve_version.py)
+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
@@ -19,7 +19,7 @@ endif
.PHONY: list
list:
- @python3 scripts/list-images.py $(arg)
+ @python scripts/list-images.py $(arg)
.PHONY: display-image-version
display-image-version:
@@ -99,7 +99,7 @@ endif
.PHONY: push-staging
push-staging: build _push-staging
_push-staging:
- python3 scripts/push-staging.py ${override}
+ python scripts/push-staging.py ${override}
# push to local registry, useful to push the built images to local registry
diff --git a/scripts/README.md b/scripts/README.md
index b11e68cf..6b13cceb 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -50,13 +50,13 @@ Utilitary script used to retrieve all images that can be built on this repo, the
the community image list:
```bash
-$ python3 list-images.py
+$ python list-images.py
```
And the product image list by using the `--prod` flag:
```bash
-$ python3 list-images.py --prod
+$ python list-images.py --prod
```
diff --git a/scripts/common.py b/scripts/common.py
index 40b8c777..f00377ff 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
# This script defines some common function that are used by manage-kogito-version.py and push-staging.py script
diff --git a/scripts/list-images.py b/scripts/list-images.py
index 7cfa9ede..e982d164 100644
--- a/scripts/list-images.py
+++ b/scripts/list-images.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
# Script responsible to update the tests with
# Should be run from root directory of the repository
diff --git a/scripts/manage-kogito-version.py b/scripts/manage-kogito-version.py
index ec344bc8..346215fa 100644
--- a/scripts/manage-kogito-version.py
+++ b/scripts/manage-kogito-version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
# This script will be responsible to help to manage kogito images and modules version, it will update all needed files
# Example of usage:
# # move the current version to the next one or rcX
diff --git a/scripts/push-local-registry.sh b/scripts/push-local-registry.sh
index 157eb11e..79d2ca89 100644
--- a/scripts/push-local-registry.sh
+++ b/scripts/push-local-registry.sh
@@ -26,5 +26,5 @@ while read image; do
${BUILD_ENGINE} tag quay.io/kiegroup/${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 <<<$(python3 scripts/list-images.py)
+done <<<$(python scripts/list-images.py)
diff --git a/scripts/push-staging.py b/scripts/push-staging.py
index 9a95c925..5fde3593 100644
--- a/scripts/push-staging.py
+++ b/scripts/push-staging.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
# This script will be responsible to fetch the latest rc tags from each image and define the next
# rc tag to avoid images get overridden.
#
diff --git a/scripts/retrieve_version.py b/scripts/retrieve_version.py
index 64e4274c..b1b1c7a9 100644
--- a/scripts/retrieve_version.py
+++ b/scripts/retrieve_version.py
@@ -1,7 +1,7 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
#Script responsible to update the tests with
#Should be run from root directory of the repository
-#Sample usage: python3 scripts/retrieve_version.py
+#Sample usage: python scripts/retrieve_version.py
import sys
sys.dont_write_bytecode = True
diff --git a/scripts/update-repository.py b/scripts/update-repository.py
index 0c632d1b..9103b468 100644
--- a/scripts/update-repository.py
+++ b/scripts/update-repository.py
@@ -1,7 +1,7 @@
-#!/usr/bin/python3
+#!/usr/bin/env python
#Script responsible to update the tests with
#Should be run from root directory of the repository
-#Sample usage: python3 scripts/update-tests.py
+#Sample usage: python scripts/update-tests.py
import sys
sys.dont_write_bytecode = True
diff --git a/tests/test-apps/clone-repo.sh b/tests/test-apps/clone-repo.sh
index f39a94bf..360d1d9f 100755
--- a/tests/test-apps/clone-repo.sh
+++ b/tests/test-apps/clone-repo.sh
@@ -8,7 +8,7 @@ if [ -n "${IMAGE_NAME}" ]; then
if [[ ${IMAGE_NAME} =~ rhpam|logic* ]]; then
prod="--prod"
fi
- if python3 ../../scripts/list-images.py ${prod} -is ${IMAGE_NAME}; then
+ if python ../../scripts/list-images.py ${prod} -is ${IMAGE_NAME}; then
echo "Target image is supporting services, skipping examples build"
exit 0
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 13/47: pass PR source repository name
Posted by ri...@apache.org.
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 a9fab7701e98fb8fe9b6f202299ea0ccaee6f2f3
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 8 17:39:16 2023 +0100
pass PR source repository name
---
.ci/jenkins/Jenkinsfile | 19 ++++++++++---------
.ci/jenkins/Jenkinsfile.build-and-test | 4 ++--
.ci/jenkins/dsl/jobs.groovy | 2 ++
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 16174a51..6a27f963 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -13,11 +13,12 @@ pipeline {
stage("Build&Test") {
steps {
script {
- sh 'env'
+ sh 'printenv'
List buildParams = []
- buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${CHANGE_ID}: ${CHANGE_URL}"))
- buildParams.add(string(name: "CHANGE_ID", value: CHANGE_ID))
- buildParams.add(string(name: "CHANGE_URL", value: CHANGE_URL))
+ buildParams.add(string(name: 'DISPLAY_NAME', value: "PR #${CHANGE_ID}: ${CHANGE_URL}"))
+ buildParams.add(string(name: 'CHANGE_ID', value: CHANGE_ID))
+ buildParams.add(string(name: 'CHANGE_URL', value: CHANGE_URL))
+ buildParams.add(string(name: 'SOURCE_REPOSITORY', value: getChangeRepository()))
buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
@@ -38,7 +39,11 @@ pipeline {
}
String getChangeAuthor() {
- return CHANGE_AUTHOR
+ return pullrequest.getAuthorAndRepoForPr().split('/')[0]
+}
+
+String getChangeRepository() {
+ return pullrequest.getAuthorAndRepoForPr().split('/')[1]
}
String getChangeBranch() {
@@ -49,10 +54,6 @@ String getChangeTarget() {
return CHANGE_TARGET
}
-String getRepoName() {
- return env.REPO_NAME
-}
-
String getGitAuthorCredentialsId() {
return env.AUTHOR_CREDS_ID
}
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
index 12eb8a76..a6c91e4b 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -9,6 +9,7 @@ pipeline {
}
options {
timeout(time: 120, unit: 'MINUTES')
+ skipDefaultCheckout()
}
stages {
stage('Initialization') {
@@ -17,10 +18,9 @@ pipeline {
sh 'printenv'
dir(getRepoName()) {
- // githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorCredentialsId(), usernamePassword: 'kie-ci'])
// TODO Test pupose
deleteDir()
- checkout(githubscm.resolveRepository('incubator-kie-kogito-images', 'apache', 'radtriste-fix-pipelines', false))
+ githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorCredentialsId(), usernamePassword: 'kie-ci'])
}
}
}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index cf649084..2d850867 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -186,6 +186,7 @@ void setupBuildAndTestJob(JobType jobType) {
def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images.build-and-test', jobType, "${jenkins_path}/Jenkinsfile.build-and-test", 'Kogito Images Build And test images')
// Use jenkinsfile from the build branch
jobParams.git.author = '${SOURCE_AUTHOR}'
+ jobParams.git.repository = '${SOURCE_REPOSITORY}'
jobParams.git.branch = '${SOURCE_BRANCH}'
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
jobParams.env.putAll([
@@ -206,6 +207,7 @@ void setupBuildAndTestJob(JobType jobType) {
stringParam('DISPLAY_NAME', '', 'Setup a specific build display name')
stringParam('SOURCE_AUTHOR', Utils.getGitAuthor(this), 'Build author')
+ stringParam('SOURCE_REPOSITORY', Utils.getRepoName(this), 'Build repository name')
stringParam('SOURCE_BRANCH', Utils.getGitBranch(this), 'Build branch name')
stringParam('TARGET_BRANCH', '', '(Optional) In case of a PR to merge with target branch, please provide the target branch')
stringParam('CHANGE_ID', '', 'CHANGE_ID coming from Branch Source Plugin')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 41/47: adjust trusty feature file
Posted by ri...@apache.org.
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 865bbe5207cc79d831cb431e103caf43a3e566f7
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Tue Nov 21 11:53:58 2023 +0100
adjust trusty feature file
---
tests/features/trusty/kogito-trusty-common.feature | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/features/trusty/kogito-trusty-common.feature b/tests/features/trusty/kogito-trusty-common.feature
index f755568b..81363001 100644
--- a/tests/features/trusty/kogito-trusty-common.feature
+++ b/tests/features/trusty/kogito-trusty-common.feature
@@ -3,7 +3,8 @@
@quay.io/kiegroup/kogito-trusty-postgresql
Feature: Kogito-trusty common feature.
Scenario: Scenario: Verify if the debug is correctly enabled and test default http port
- When container is started with env
- | variable | value |
- | SCRIPT_DEBUG | true |
+ When container is started with args
+ | arg | value |
+ | command | bash -c "sleep 2s; /home/kogito/kogito-app-launch.sh" |
+ | env_json | {"SCRIPT_DEBUG":"true"} |
Then container log should contain -Dtrusty.explainability.enabled=true -Djava.library.path=/home/kogito/lib -Dquarkus.http.host=0.0.0.0 -Dquarkus.http.port=8080
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 23/47: invoke bash explicitly to process bash directives
Posted by ri...@apache.org.
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 8b1180b4687f10739ce6237e1854dc3299cba742
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Tue Nov 14 16:54:59 2023 +0100
invoke bash explicitly to process bash directives
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index f57558c0..852d729a 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ clone-repos:
# if the ignore_test env is not defined or false, proceed with the tests, as first step prepare the examples to be used
ifneq ($(ignore_test),true)
ifneq ($(ignore_test_prepare),true)
- cd tests/test-apps && export CONTAINER_ENGINE=$(BUILD_ENGINE) && sh clone-repo.sh $(NATIVE) $(image_name)
+ cd tests/test-apps && export CONTAINER_ENGINE=$(BUILD_ENGINE) && bash clone-repo.sh $(NATIVE) $(image_name)
cd ../..
endif
endif
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 07/47: call the method actually
Posted by ri...@apache.org.
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 96b8ef19029b8f55960907ae1db64a1b99a44eea
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 8 10:46:31 2023 +0100
call the method actually
---
.ci/jenkins/dsl/jobs.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index fd72e406..7655e5bc 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -17,7 +17,7 @@ import org.kie.jenkins.jobdsl.Utils
jenkins_path = '.ci/jenkins'
// PR checks
-Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile", JobType.PULL_REQUEST.getName())
+setupPrJob()
// Init branch
createSetupBranchJob()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 05/47: Update kogito-images job to follow apache config
Posted by ri...@apache.org.
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 311866d270a3af1934005465fca246fd4381b4c8
Author: Ricardo Zanini <za...@redhat.com>
AuthorDate: Tue Nov 7 17:18:27 2023 -0300
Update kogito-images job to follow apache config
Signed-off-by: Ricardo Zanini <za...@redhat.com>
---
.ci/jenkins/dsl/jobs.groovy | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 8e533131..9b1c3027 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -40,7 +40,7 @@ setupQuarkusUpdateJob()
void setupPrJob() {
setupBuildImageJob(JobType.PULL_REQUEST)
- def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.PULL_REQUEST, "${jenkins_path}/Jenkinsfile", "Kogito Images PR check")
+ def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-pr', JobType.PULL_REQUEST, "${jenkins_path}/Jenkinsfile", "Kogito Images PR check")
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
jobParams.pr.putAll([
run_only_for_branches: [ "${GIT_BRANCH}" ],
@@ -59,7 +59,7 @@ void setupPrJob() {
}
void createSetupBranchJob() {
- def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
+ def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-pr', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
jobParams.env.putAll([
GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
@@ -255,7 +255,7 @@ void setupPromoteJob(JobType jobType) {
}
void setupQuarkusUpdateJob() {
- KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
+ KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images-pr', [:], [:], [], [
"python scripts/update-repository.py --quarkus-platform-version %new_version%"
])
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 47/47: Revert find expression and command
Posted by ri...@apache.org.
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 c2e0799af49b57c2386cacdf87ceb46aa59067a6
Author: Ricardo Zanini <za...@redhat.com>
AuthorDate: Tue Nov 21 15:43:31 2023 -0300
Revert find expression and command
Signed-off-by: Ricardo Zanini <za...@redhat.com>
---
modules/kogito-swf/common/scripts/added/build-app.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
index 004c53c2..b4ead3d5 100755
--- a/modules/kogito-swf/common/scripts/added/build-app.sh
+++ b/modules/kogito-swf/common/scripts/added/build-app.sh
@@ -22,7 +22,7 @@ log_info "-> Copying files from ${resources_path}, if any..."
if [ -n "${resources_path}" ]; then
destination="${KOGITO_HOME}/serverless-workflow-project/src/main/resources/"
cd "${resources_path}" &&
- rsync -av --remove-source-files --prune-empty-dirs --progress --files-from <(find -E . -regex '.*\.(yaml|yml|json|properties)$' -type f) . "$destination" &&
+ rsync -av --remove-source-files --prune-empty-dirs --progress --files-from <(find . -regex '.*\.\(yaml\|yml\|json\|properties\)$' -type f) . "$destination" &&
cd -
find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 46/47: Add E command handler to find script
Posted by ri...@apache.org.
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 d65e88f59ee67bb80edc9a553ea54b748800d94e
Author: Ricardo Zanini <za...@redhat.com>
AuthorDate: Tue Nov 21 15:40:00 2023 -0300
Add E command handler to find script
Signed-off-by: Ricardo Zanini <za...@redhat.com>
---
modules/kogito-swf/common/scripts/added/build-app.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/kogito-swf/common/scripts/added/build-app.sh b/modules/kogito-swf/common/scripts/added/build-app.sh
index d570ffea..004c53c2 100755
--- a/modules/kogito-swf/common/scripts/added/build-app.sh
+++ b/modules/kogito-swf/common/scripts/added/build-app.sh
@@ -22,7 +22,7 @@ log_info "-> Copying files from ${resources_path}, if any..."
if [ -n "${resources_path}" ]; then
destination="${KOGITO_HOME}/serverless-workflow-project/src/main/resources/"
cd "${resources_path}" &&
- rsync -av --remove-source-files --prune-empty-dirs --progress --files-from <(find . -regex '.*\.(yaml|yml|json|properties)$' -type f) . "$destination" &&
+ rsync -av --remove-source-files --prune-empty-dirs --progress --files-from <(find -E . -regex '.*\.(yaml|yml|json|properties)$' -type f) . "$destination" &&
cd -
find "${resources_path}" -name 'jvm.config' -exec echo "--> found {}" \; -exec mkdir -p .mvn \; -exec cp -v {} .mvn/ \;
else
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 34/47: try read logs from buildkit
Posted by ri...@apache.org.
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 270ffaa4f6cda924fcfc0df2a3d9c196db4da52a
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 16 13:02:03 2023 +0100
try read logs from buildkit
---
.ci/jenkins/Jenkinsfile.build-image | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 809e860e..fbce6552 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -207,7 +207,8 @@ pipeline {
void collectContainerLogs() {
sh '''#!/bin/bash
- for container in $(docker container ls -a --format "{{.Names}}"); do docker logs $container >& ${container}-container.log; done
+ BUILDER_CONTAINER_NAME=$(docker container ls --filter 'name=buildx_buildkit_mybuilder' --format '{{.Names}}')
+ docker exec -it $BUILDER_CONTAINER_NAME bash -c 'for container in $(docker container ls --format "{{.Names}}"); do echo "[$container:START]"; docker logs $container; echo "[$container:END]"; done' &> full.log
'''
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 11/47: fix closure
Posted by ri...@apache.org.
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 2f9f34a0985f8602a37f0ff8792a82b2f6a2461a
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 8 14:02:17 2023 +0100
fix closure
---
.ci/jenkins/Jenkinsfile | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 86548427..a7c80858 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -11,22 +11,25 @@ pipeline {
}
stages {
stage("Build&Test") {
- List buildParams = []
- buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${CHANGE_ID} - ${image}: ${CHANGE_URL}"))
- buildParams.add(string(name: "CHANGE_ID", value: CHANGE_ID))
- buildParams.add(string(name: "CHANGE_URL", value: CHANGE_URL))
- buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
- buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
- buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
- buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
-
- // Keep executing so we can cancel all if needed
- def job = build(job: "${getRepoName()}.build-and-test", wait: true, parameters: buildParams, propagate: false)
- if (job.result != 'SUCCESS') {
- if (job.result == 'UNSTABLE') {
- unstable("Tests on images seems to have failed: ${job.absoluteUrl}")
- } else {
- error("Error building images. Please check the logs of the job: ${job.absoluteUrl}")
+ steps {
+ script {
+ List buildParams = []
+ buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${CHANGE_ID}: ${CHANGE_URL}"))
+ buildParams.add(string(name: "CHANGE_ID", value: CHANGE_ID))
+ buildParams.add(string(name: "CHANGE_URL", value: CHANGE_URL))
+ buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
+ buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
+ buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
+ buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
+ // Keep executing so we can cancel all if needed
+ def job = build(job: "../kogito-images.build-and-test", wait: true, parameters: buildParams, propagate: false)
+ if (job.result != 'SUCCESS') {
+ if (job.result == 'UNSTABLE') {
+ unstable("Tests on images seems to have failed: ${job.absoluteUrl}")
+ } else {
+ error("Error building images. Please check the logs of the job: ${job.absoluteUrl}")
+ }
+ }
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 29/47: fix build.log archiving
Posted by ri...@apache.org.
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 ed0ac1a3a07ff7c5dc92d567563d80ed8628a744
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 16 08:00:14 2023 +0100
fix build.log archiving
---
.ci/jenkins/Jenkinsfile.build-image | 1 +
1 file changed, 1 insertion(+)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 889cb831..2ba205f5 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -198,6 +198,7 @@ pipeline {
always {
script {
updateGithubCommitStatusFromBuildResult()
+ archiveArtifacts artifacts: '**/*-build.log', allowEmptyArchive: true
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 06/47: generate also build-image job
Posted by ri...@apache.org.
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 28dcc0405bede19f9e0ef3cdc3005e22986c26b8
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 8 10:21:35 2023 +0100
generate also build-image job
---
.ci/jenkins/Jenkinsfile | 4 ++--
.ci/jenkins/dsl/jobs.groovy | 20 +++-----------------
2 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 0715215d..82afa166 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
// githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorCredentialsId(), usernamePassword: 'kie-ci'])
// TODO Test pupose
deleteDir()
- checkout(githubscm.resolveRepository('kogito-images', 'radtriste', 'fix-pipelines', false))
+ checkout(githubscm.resolveRepository('incubator-kie-kogito-images', 'apache', 'radtriste-fix-pipelines', false))
}
}
}
@@ -67,7 +67,7 @@ Closure createBuildAndTestStageClosure(String image) {
return {
stage("Build&Test ${image}") {
List buildParams = []
- buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${ghprbPullId} - ${image}: ${ghprbPullLink}"))
+ buildParams.add(string(name: "DISPLAY_NAME", value: "PR #${CHANGE_ID} - ${image}: ${CHANGE_URL}"))
buildParams.add(string(name: 'BUILD_IMAGE_NAME', value: image))
buildParams.add(string(name: 'SOURCE_AUTHOR', value: getChangeAuthor()))
buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 9b1c3027..fd72e406 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -17,7 +17,7 @@ import org.kie.jenkins.jobdsl.Utils
jenkins_path = '.ci/jenkins'
// PR checks
-Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile")
+Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile", JobType.PULL_REQUEST.getName())
// Init branch
createSetupBranchJob()
@@ -40,22 +40,8 @@ setupQuarkusUpdateJob()
void setupPrJob() {
setupBuildImageJob(JobType.PULL_REQUEST)
- def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-pr', JobType.PULL_REQUEST, "${jenkins_path}/Jenkinsfile", "Kogito Images PR check")
- JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
- jobParams.pr.putAll([
- run_only_for_branches: [ "${GIT_BRANCH}" ],
- disable_status_message_error: true,
- disable_status_message_failure: true,
- commitContext: 'Retrieve and Launch Image Checks',
- contextShowtestResults: false,
- ])
- if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
- jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))
- }
- jobParams.env.putAll([
- AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
- ])
- KogitoJobTemplate.createPRJob(this, jobParams)
+ // Branch Source Plugin multibranchPipelineJob
+ Utils.isMainBranch(this) && KogitoJobTemplate.createPullRequestMultibranchPipelineJob(this, "${jenkins_path}/Jenkinsfile", JobType.PULL_REQUEST.getName())
}
void createSetupBranchJob() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 45/47: Fix temporary dir creation on bats test
Posted by ri...@apache.org.
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 904880107203b766f4c09d50779af70e84895ea3
Author: Ricardo Zanini <za...@redhat.com>
AuthorDate: Tue Nov 21 15:36:56 2023 -0300
Fix temporary dir creation on bats test
Signed-off-by: Ricardo Zanini <za...@redhat.com>
---
.../common/scripts/tests/bats/kogito-swf-builder-build-app.bats | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
index 4fa64eff..d0993822 100644
--- a/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
+++ b/modules/kogito-swf/common/scripts/tests/bats/kogito-swf-builder-build-app.bats
@@ -16,11 +16,11 @@ teardown() {
}
@test "verify copy resources is working" {
- mkdir -p /tmp/resources
- cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/kogito-swf-builder/resources/greet-with-inputschema/* /tmp/resources/
+ TEMPD=$(mktemp -d)
+ cp -r $BATS_TEST_DIRNAME/../../../../../../tests/shell/kogito-swf-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 /tmp/resources/ || true
+ source ${KOGITO_HOME}/launch/build-app.sh ${TEMPD} || true
[[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/greet.sw.json ]]
[[ -f "${KOGITO_HOME}"/serverless-workflow-project/src/main/resources/schemas/input.json ]]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 27/47: tweak pipeline config
Posted by ri...@apache.org.
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 b8799bdf055bd189f35722b838774fb3b390aa0d
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 15 13:40:30 2023 +0100
tweak pipeline config
---
.ci/jenkins/Jenkinsfile.build-image | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index aa8202d6..2051bdab 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -7,6 +7,7 @@ pipeline {
docker {
image env.AGENT_DOCKER_BUILDER_IMAGE
args env.AGENT_DOCKER_BUILDER_ARGS
+ alwaysPull true
}
}
options {
@@ -187,7 +188,7 @@ pipeline {
unstable "Testing error(s) for image ${getBuildImageName()}"
} finally {
junit testResults: 'target/**/*.xml', allowEmptyResults: true
- archiveArtifacts artifacts: 'target/**/*.xml', allowEmptyArchive: true
+ archiveArtifacts artifacts: 'target/**/*.xml, **/*-build.log', allowEmptyArchive: true
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 04/47: Fix branch name
Posted by ri...@apache.org.
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 9c57cc5db47bf7b658fda5fa215a8a90f105ebd0
Author: Ricardo Zanini <za...@redhat.com>
AuthorDate: Wed Nov 1 17:02:42 2023 -0300
Fix branch name
Signed-off-by: Ricardo Zanini <za...@redhat.com>
---
.ci/jenkins/Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index f73926cb..0715215d 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -20,7 +20,7 @@ pipeline {
// githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorCredentialsId(), usernamePassword: 'kie-ci'])
// TODO Test pupose
deleteDir()
- checkout(githubscm.resolveRepository('kogito-images', 'radtriste', 'fix_pipelines', false))
+ checkout(githubscm.resolveRepository('kogito-images', 'radtriste', 'fix-pipelines', false))
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 43/47: Tidying the PR up #1
Posted by ri...@apache.org.
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 6a325bfcfd5215596f4e9d9f34878522675902c1
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Tue Nov 21 16:54:18 2023 +0100
Tidying the PR up #1
---
.ci/jenkins/Jenkinsfile | 2 +-
.ci/jenkins/Jenkinsfile.build-image | 6 ++++++
.ci/jenkins/Jenkinsfile.deploy | 3 +++
.ci/jenkins/dsl/jobs.groovy | 4 ++--
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 6a27f963..5c5b7fe5 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -10,7 +10,7 @@ pipeline {
skipDefaultCheckout()
}
stages {
- stage("Build&Test") {
+ stage("Invoke build-and-test") {
steps {
script {
sh 'printenv'
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index 37774e3b..9a7b1d99 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -200,6 +200,12 @@ pipeline {
archiveArtifacts artifacts: '**/*-build.log, **/*.log', allowEmptyArchive: true
}
}
+ cleanup {
+ util.cleanNode(env.CONTAINER_ENGINE)
+
+ cloud.cleanDockerMultiplatformBuild()
+ cloud.cleanLocalRegistry(env.localRegistryUrl.split(':')[1])
+ }
}
}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index 4441c273..ef10df47 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -226,6 +226,9 @@ pipeline {
archiveArtifacts artifacts: env.PROPERTIES_FILE_NAME, allowEmptyArchive:true
}
}
+ cleanup {
+ util.cleanNode('docker')
+ }
unsuccessful {
sendUnsuccessfulNotification()
}
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 2d850867..a062e6d5 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -46,7 +46,7 @@ void setupPrJob() {
}
void createSetupBranchJob() {
- def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images-pr', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
+ def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-images', JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Images Init Branch')
JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this, jobParams)
jobParams.env.putAll([
GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
@@ -297,7 +297,7 @@ void setupPromoteJob(JobType jobType) {
}
void setupQuarkusUpdateJob() {
- KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images-pr', [:], [:], [], [
+ KogitoJobUtils.createQuarkusUpdateToolsJob(this, 'kogito-images', [:], [:], [], [
"python scripts/update-repository.py --quarkus-platform-version %new_version%"
])
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 35/47: try log everything
Posted by ri...@apache.org.
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 2338e98d7e438699694d6f39b2cd5e4aa0df2556
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 16 14:42:02 2023 +0100
try log everything
---
.ci/jenkins/Jenkinsfile.build-image | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index fbce6552..f979091f 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -188,7 +188,7 @@ pipeline {
unstable "Testing error(s) for image ${getBuildImageName()}"
} finally {
junit testResults: 'target/**/*.xml', allowEmptyResults: true
- archiveArtifacts artifacts: 'target/**/*.xml', allowEmptyArchive: true
+ archiveArtifacts artifacts: 'target/**/*.xml, **/*.txt, **/*.log', allowEmptyArchive: true
}
}
}
@@ -199,7 +199,7 @@ pipeline {
script {
updateGithubCommitStatusFromBuildResult()
collectContainerLogs()
- archiveArtifacts artifacts: '**/*-build.log, **/*-container.log', allowEmptyArchive: true
+ archiveArtifacts artifacts: '**/*-build.log, **/containers.log', allowEmptyArchive: true
}
}
}
@@ -207,8 +207,7 @@ pipeline {
void collectContainerLogs() {
sh '''#!/bin/bash
- BUILDER_CONTAINER_NAME=$(docker container ls --filter 'name=buildx_buildkit_mybuilder' --format '{{.Names}}')
- docker exec -it $BUILDER_CONTAINER_NAME bash -c 'for container in $(docker container ls --format "{{.Names}}"); do echo "[$container:START]"; docker logs $container; echo "[$container:END]"; done' &> full.log
+ for container in $(docker container ls --format "{{.Names}}"); do echo "[$container:START]"; docker logs $container; echo "[$container:END]"; done' &> containers.log
'''
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 20/47: prevent repeated checkout
Posted by ri...@apache.org.
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 cb9ccb5defd0a78b3271afabeb0710e3f78cd701
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Fri Nov 10 12:57:39 2023 +0100
prevent repeated checkout
---
.ci/jenkins/Jenkinsfile.build-and-test | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
index 914762b5..a0e2fcea 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -44,6 +44,7 @@ pipeline {
steps {
script {
dir(getRepoName()) {
+ githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getGitAuthorCredentialsId())
parallelStages = [:]
for(String image : getImages()){
parallelStages[image] = createBuildAndTestStageClosure(image)
@@ -73,10 +74,9 @@ Closure createBuildAndTestStageClosure(String image) {
buildParams.add(string(name: 'SOURCE_BRANCH', value: getChangeBranch()))
buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
-
- githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getGitAuthorCredentialsId())
+
githubscm.updateGithubCommitStatus(image, 'PENDING', 'Queued', getRepoName())
-
+
// Keep executing so we can cancel all if needed
def job = build(job: 'kogito-images.build-image', wait: true, parameters: buildParams, propagate: false)
if (job.result != 'SUCCESS') {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 14/47: provide correct creds
Posted by ri...@apache.org.
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 e5f098b8718d0a6a9248ada29fb0625bf3d69bd1
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 9 08:45:39 2023 +0100
provide correct creds
---
.ci/jenkins/Jenkinsfile.build-and-test | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-and-test b/.ci/jenkins/Jenkinsfile.build-and-test
index a6c91e4b..c17be2b1 100644
--- a/.ci/jenkins/Jenkinsfile.build-and-test
+++ b/.ci/jenkins/Jenkinsfile.build-and-test
@@ -20,7 +20,7 @@ pipeline {
dir(getRepoName()) {
// TODO Test pupose
deleteDir()
- githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorCredentialsId(), usernamePassword: 'kie-ci'])
+ githubscm.checkoutIfExists(getRepoName(), getChangeAuthor(), getChangeBranch(), 'apache', getChangeTarget(), true, credentials = [token: getGitAuthorCredentialsTokenId(), usernamePassword: getGitAuthorCredentialsId()])
}
}
}
@@ -124,3 +124,7 @@ String getRepoName() {
String getGitAuthorCredentialsId() {
return env.AUTHOR_CREDS_ID
}
+
+String getGitAuthorTokenCredentialsId() {
+ return env.AUTHOR_TOKEN_CREDS_ID
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 32/47: try bash
Posted by ri...@apache.org.
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 7419400a7294b2b693fb52706990e50ce036ba4c
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Thu Nov 16 10:54:55 2023 +0100
try bash
---
.ci/jenkins/Jenkinsfile.build-image | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.ci/jenkins/Jenkinsfile.build-image b/.ci/jenkins/Jenkinsfile.build-image
index d1967bae..a970a080 100644
--- a/.ci/jenkins/Jenkinsfile.build-image
+++ b/.ci/jenkins/Jenkinsfile.build-image
@@ -206,7 +206,9 @@ pipeline {
}
void collectContainerLogs() {
- sh 'for container in $(docker container ls --format "{{.Names}}"); do docker logs $container >& ${container}-container.log; done'
+ sh '''#!/bin/bash
+ for container in $(docker container ls --format "{{.Names}}"); do docker logs $container >& ${container}-container.log; done
+ '''
}
String getMakeBuildImageArgs() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org
(incubator-kie-kogito-images) 08/47: fix util method call params
Posted by ri...@apache.org.
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 0730fa570e1f41be63ad577ac9f4026454bcb969
Author: jstastny-cz <ja...@ibm.com>
AuthorDate: Wed Nov 8 10:48:46 2023 +0100
fix util method call params
---
.ci/jenkins/Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index 82afa166..2d5cb62f 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -57,7 +57,7 @@ pipeline {
post {
unsuccessful {
script {
- pullrequest.postComment(util.getMarkdownTestSummary('PR', "${BUILD_URL}", 'GITHUB'))
+ pullrequest.postComment(util.getMarkdownTestSummary('PR', '', "${BUILD_URL}", 'GITHUB'))
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org