This is an automated email from the ASF dual-hosted git repository.
jstastnycz pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 28b2d3dc kie-issues#574 Initial ASF Jenkins CI Setup (#1530)
28b2d3dc is described below
commit 28b2d3dc945e48659b199cca33723568b848f72e
Author: Jan Stastny <[email protected]>
AuthorDate: Tue Sep 19 20:22:44 2023 +0200
kie-issues#574 Initial ASF Jenkins CI Setup (#1530)
Co-authored-by: radtriste <[email protected]>
---
.ci/jenkins/Jenkinsfile | 6 +-
.ci/jenkins/Jenkinsfile-rhpam | 149 ------------------------
.ci/jenkins/Jenkinsfile.deploy | 21 +---
.ci/jenkins/Jenkinsfile.examples-images.deploy | 17 +--
.ci/jenkins/Jenkinsfile.examples-images.promote | 11 +-
.ci/jenkins/Jenkinsfile.profiling | 18 +--
.ci/jenkins/Jenkinsfile.promote | 9 +-
.ci/jenkins/Jenkinsfile.setup-branch | 9 +-
.ci/jenkins/dsl/jobs.groovy | 31 +++--
.ci/jenkins/dsl/test.sh | 2 +-
.ci/jenkins/scripts/container.groovy | 4 +-
.ci/jenkins/scripts/helper.groovy | 2 +-
.github/bot-files/comments.yml | 2 +-
.github/pull_request_template.md | 4 +-
.github/workflows/jenkins-tests-PR.yml | 4 +-
15 files changed, 56 insertions(+), 233 deletions(-)
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
index e3d14044..e6f1d6c9 100644
--- a/.ci/jenkins/Jenkinsfile
+++ b/.ci/jenkins/Jenkinsfile
@@ -8,7 +8,7 @@ testsFailed = false
pipeline {
agent {
- label 'kogito-jenkins-node && !master'
+ label 'kogito-jenkins-node && !master' // Running on IBMCLoud jenkins,
no change to be done there
}
tools {
go 'golang-1.17'
@@ -20,7 +20,7 @@ pipeline {
environment {
OPENSHIFT_INTERNAL_REGISTRY =
'image-registry.openshift-image-registry.svc:5000'
- CONTAINER_ENGINE = 'podman'
+ CONTAINER_ENGINE = 'docker'
CODECOV_TOKEN = credentials('KOGITO_OPERATOR_CODECOV_TOKEN')
}
@@ -32,7 +32,7 @@ pipeline {
sh ' git config --global user.email "[email protected]" '
sh ' git config --global user.name "kie user"'
- githubscm.checkoutIfExists('kogito-operator',
changeAuthor, changeBranch, 'kiegroup', changeTarget, true, ['token' :
'GITHUB_TOKEN', 'usernamePassword' : 'user-kie-ci10'])
+
githubscm.checkoutIfExists('incubator-kie-kogito-operator', changeAuthor,
changeBranch, 'apache', changeTarget, true, ['token' : 'GITHUB_TOKEN',
'usernamePassword' : 'user-kie-ci10'])
sh "set +x && oc login --token=\$(oc whoami -t)
--server=${OPENSHIFT_API} --insecure-skip-tls-verify"
}
}
diff --git a/.ci/jenkins/Jenkinsfile-rhpam b/.ci/jenkins/Jenkinsfile-rhpam
deleted file mode 100644
index 15a111ff..00000000
--- a/.ci/jenkins/Jenkinsfile-rhpam
+++ /dev/null
@@ -1,149 +0,0 @@
-@Library('jenkins-pipeline-shared-libraries')_
-
-def changeAuthor = env.ghprbPullAuthorLogin ?: CHANGE_AUTHOR
-def changeBranch = env.ghprbSourceBranch ?: CHANGE_BRANCH
-def changeTarget = env.ghprbTargetBranch ?: CHANGE_TARGET
-
-testsFailed = false
-
-pipeline {
- agent {
- label 'kogito-jenkins-node && !master'
- }
- tools {
- go 'golang-1.17'
- }
- options {
- buildDiscarder logRotator(artifactDaysToKeepStr: '',
artifactNumToKeepStr: '', daysToKeepStr: '', numToKeepStr: '10')
- timeout(time: 12, unit: 'HOURS') // We give a lot of time to timeout
due to the lock on Openshift
- }
- environment {
- OPENSHIFT_INTERNAL_REGISTRY =
'image-registry.openshift-image-registry.svc:5000'
-
- CONTAINER_ENGINE = 'podman'
- }
- stages {
- stage('Initialize') {
- steps {
- script {
- cleanGoPath()
-
- sh ' git config --global user.email "[email protected]" '
- sh ' git config --global user.name "kie user"'
- githubscm.checkoutIfExists('kogito-operator',
changeAuthor, changeBranch, 'kiegroup', changeTarget, true, ['token' :
'GITHUB_TOKEN', 'usernamePassword' : 'user-kie-ci10'])
- sh "set +x && oc login --token=\$(oc whoami -t)
--server=${OPENSHIFT_API} --insecure-skip-tls-verify"
- }
- }
- }
- stage('Build RHPAM Kogito Operator') {
- steps {
- // Workaround until Operator PR checks is solved
- sh "echo '' > content_sets.yaml"
-
- sh "make -f Makefile.rhpam BUILDER=${CONTAINER_ENGINE}"
- }
- }
- stage('Push Operator Image(s) to Openshift Registry') {
- steps {
- sh """
- set +x && ${CONTAINER_ENGINE} login -u jenkins -p \$(oc
whoami -t) --tls-verify=false ${OPENSHIFT_REGISTRY}
- TAG_OPERATOR=\$(go run version/getrhpamversion.go)
-
- ${CONTAINER_ENGINE} tag
registry.stage.redhat.io/rhpam-7/rhpam-kogito-rhel8-operator:\${TAG_OPERATOR}
${OPENSHIFT_REGISTRY}/openshift/rhpam-kogito-rhel8-operator:pr-\$(echo
\${GIT_COMMIT} | cut -c1-7)
- ${CONTAINER_ENGINE} push --tls-verify=false
${OPENSHIFT_REGISTRY}/openshift/rhpam-kogito-rhel8-operator:pr-\$(echo
\${GIT_COMMIT} | cut -c1-7)
- """
- }
- }
-
- stage('Run BDD tests') {
- options {
- lock("BDD tests ${OPENSHIFT_API}")
- }
- stages {
- stage('Running smoke tests') {
- options {
- timeout(time: 90, unit: 'MINUTES')
- }
- steps {
- script {
- try {
- // Run just smoke tests to verify basic
operator functionality
- sh "make run-smoke-tests tags='@rhpam'
concurrent=5 ${getBDDParameters()}"
- } catch (err) {
- testsFailed = true
- util.archiveConsoleLog()
- }
- }
- }
- post {
- always {
- archiveArtifacts artifacts: 'test/logs/**/*.log',
allowEmptyArchive: true
- junit testResults: 'test/logs/**/junit.xml',
allowEmptyResults: true
- }
- cleanup {
- sh 'cd test && go run scripts/prune_namespaces.go'
- }
- }
- }
- }
- }
- }
- post {
- always {
- script {
- // Verify here if BDD tests due to test errors or build error
- if (testsFailed && currentBuild.currentResult == 'SUCCESS') {
- error 'There was a test execution failure'
- }
- }
- }
- unsuccessful {
- script {
- def additionalInfo = "You can find test error logs here:
${BUILD_URL}/artifact/test/logs/error/"
- pullrequest.postComment(util.getMarkdownTestSummary('RHPAM
PR', additionalInfo, "${BUILD_URL}", 'GITHUB'), 'GITHUB_TOKEN')
- }
- }
- cleanup {
- script {
- cleanGoPath()
- cleanWs()
- }
- }
- }
-}
-
-void cleanGoPath() {
- sh 'rm -rf $GOPATH/bin/*'
-}
-
-String getBDDParameters() {
- testParamsMap = [:]
-
- testParamsMap['load_default_config'] = true
- testParamsMap['ci'] = 'j'
- testParamsMap['load_factor'] = 3
- testParamsMap['disable_maven_native_build_container'] = true
-
- testParamsMap['operator_image_tag'] =
"${OPENSHIFT_REGISTRY}/openshift/rhpam-kogito-rhel8-operator:pr-\$(echo
\${GIT_COMMIT} | cut -c1-7)"
-
- if (env.MAVEN_MIRROR_REPOSITORY) {
- testParamsMap['maven_mirror_url'] = env.MAVEN_MIRROR_REPOSITORY
- testParamsMap['maven_ignore_self_signed_certificate'] = true
- }
-
- // Reuse runtime application images from nightly builds
- testParamsMap['image_cache_mode'] = 'always'
-
- // Don't run tests using CLI as it is not supported for product
- testParamsMap['cr_deployment_only'] = 'true'
- testParamsMap['use_product_operator'] = 'true'
-
- testParamsMap['container_engine'] = env.CONTAINER_ENGINE
-
- // Clean the cluster before/after BDD test execution
- testParamsMap['enable_clean_cluster'] = true
-
- String testParams = testParamsMap.collect { entry ->
"${entry.getKey()}=\"${entry.getValue()}\"" }.join(' ')
- echo "BDD parameters = ${testParams}"
- return testParams
-}
diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy
index e5022f48..a49693fe 100644
--- a/.ci/jenkins/Jenkinsfile.deploy
+++ b/.ci/jenkins/Jenkinsfile.deploy
@@ -7,14 +7,10 @@ gitChanges = false
pipeline {
agent {
- label 'kie-rhel8 && podman && kie-mem16g && !built-in'
- }
-
- // Needed for local build
- tools {
- maven env.BUILD_MAVEN_TOOL
- jdk env.BUILD_JDK_TOOL
- go 'golang-1.17'
+ docker {
+ image env.AGENT_DOCKER_BUILDER_IMAGE
+ args env.AGENT_DOCKER_BUILDER_ARGS
+ }
}
options {
@@ -22,21 +18,14 @@ pipeline {
}
environment {
- // Static env is defined into ./dsl/jobs.groovy file
-
KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
- CONTAINER_ENGINE = 'podman'
- CONTAINER_TLS_OPTIONS = '--tls-verify=false'
-
- JAVA_HOME = "${GRAALVM_HOME}"
-
PR_BRANCH_HASH = "${util.generateHash(10)}"
// Environment required by OLM tests when run from process
OP_TEST_CONTAINER_OPT = '-t'
OP_TEST_DEBUG = 1
- OP_TEST_CONTAINER_TOOL = 'podman'
+ OP_TEST_CONTAINER_TOOL = 'docker'
}
stages {
diff --git a/.ci/jenkins/Jenkinsfile.examples-images.deploy
b/.ci/jenkins/Jenkinsfile.examples-images.deploy
index 02a51f7b..cdbe9440 100644
--- a/.ci/jenkins/Jenkinsfile.examples-images.deploy
+++ b/.ci/jenkins/Jenkinsfile.examples-images.deploy
@@ -5,14 +5,10 @@ testsFailed = false
pipeline {
agent {
- label 'kie-rhel8 && docker && kie-mem16g && !built-in'
- }
-
- // Needed for local build
- tools {
- maven env.BUILD_MAVEN_TOOL
- jdk env.BUILD_JDK_TOOL
- go 'golang-1.17'
+ docker {
+ image env.AGENT_DOCKER_BUILDER_IMAGE
+ args env.AGENT_DOCKER_BUILDER_ARGS
+ }
}
options {
@@ -23,9 +19,7 @@ pipeline {
KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
CONTAINER_ENGINE = 'docker'
- CONTAINER_TLS_OPTIONS = ''
-
- JAVA_HOME = "${GRAALVM_HOME}"
+ CONTAINER_ENGINE_TLS_OPTIONS = ''
}
stages {
@@ -92,7 +86,6 @@ pipeline {
script {
try {
// Optaplanner taking a lot of resources, we should
not build in parallel
- // There seems to be a problem with podman executed
from the BDD tests ... Using docker instead for now ...
sh "make build-examples-images concurrent=1
${getExamplesBuildParameters(true)}"
} catch (err) {
testsFailed = true
diff --git a/.ci/jenkins/Jenkinsfile.examples-images.promote
b/.ci/jenkins/Jenkinsfile.examples-images.promote
index 870966f8..fb9f3e86 100644
--- a/.ci/jenkins/Jenkinsfile.examples-images.promote
+++ b/.ci/jenkins/Jenkinsfile.examples-images.promote
@@ -4,7 +4,10 @@ helper = null
pipeline {
agent {
- label 'rhel8 && podman && !built-in'
+ docker {
+ image env.AGENT_DOCKER_BUILDER_IMAGE
+ args env.AGENT_DOCKER_BUILDER_ARGS
+ }
}
options {
@@ -14,10 +17,8 @@ pipeline {
environment {
KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
- CONTAINER_ENGINE = 'podman'
- CONTAINER_TLS_OPTIONS = '--tls-verify=false'
-
- GITHUB_REPO = "${REPO_NAME}" // for github-release cli
+ CONTAINER_ENGINE = 'docker'
+ CONTAINER_ENGINE_TLS_OPTIONS = ''
}
stages {
diff --git a/.ci/jenkins/Jenkinsfile.profiling
b/.ci/jenkins/Jenkinsfile.profiling
index 03db97c9..02407d47 100644
--- a/.ci/jenkins/Jenkinsfile.profiling
+++ b/.ci/jenkins/Jenkinsfile.profiling
@@ -4,14 +4,10 @@ helper = null
pipeline {
agent {
- label 'kie-rhel8 && podman && kie-mem16g && !built-in'
- }
-
- // Needed for local build
- tools {
- maven env.BUILD_MAVEN_TOOL
- jdk env.BUILD_JDK_TOOL
- go 'golang-1.17'
+ docker {
+ image env.AGENT_DOCKER_BUILDER_IMAGE
+ args env.AGENT_DOCKER_BUILDER_ARGS
+ }
}
options {
@@ -21,12 +17,10 @@ pipeline {
environment {
KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
- CONTAINER_ENGINE = 'podman'
- CONTAINER_TLS_OPTIONS = '--tls-verify=false'
+ CONTAINER_ENGINE = 'docker'
+ CONTAINER_ENGINE_TLS_OPTIONS = ''
CODECOV_TOKEN = credentials('KOGITO_OPERATOR_CODECOV_TOKEN')
-
- JAVA_HOME = "${GRAALVM_HOME}"
}
stages {
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
index c52bea46..698e86bd 100644
--- a/.ci/jenkins/Jenkinsfile.promote
+++ b/.ci/jenkins/Jenkinsfile.promote
@@ -6,7 +6,10 @@ helper = null
pipeline {
agent {
- label 'rhel8 && podman && !built-in'
+ docker {
+ image env.AGENT_DOCKER_BUILDER_IMAGE
+ args env.AGENT_DOCKER_BUILDER_ARGS
+ }
}
options {
@@ -16,11 +19,7 @@ pipeline {
environment {
KOGITO_CI_EMAIL_TO = credentials("${JENKINS_EMAIL_CREDS_ID}")
- CONTAINER_ENGINE = 'podman'
- CONTAINER_TLS_OPTIONS = '--tls-verify=false'
-
PR_BRANCH_HASH = "${util.generateHash(10)}"
- GITHUB_REPO = "${REPO_NAME}" // for github-release cli
}
stages {
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch
b/.ci/jenkins/Jenkinsfile.setup-branch
index 6f2cc535..2c71fdb7 100644
--- a/.ci/jenkins/Jenkinsfile.setup-branch
+++ b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -4,11 +4,10 @@ helper = null
pipeline {
agent {
- label 'kie-rhel8 && !built-in'
- }
-
- tools {
- go 'golang-1.17'
+ docker {
+ image env.AGENT_DOCKER_BUILDER_IMAGE
+ args env.AGENT_DOCKER_BUILDER_ARGS
+ }
}
options {
diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
index 73dba1cb..fb4e54ae 100644
--- a/.ci/jenkins/dsl/jobs.groovy
+++ b/.ci/jenkins/dsl/jobs.groovy
@@ -2,10 +2,10 @@
* This file is describing all the Jenkins jobs in the DSL format (see
https://plugins.jenkins.io/job-dsl/)
* needed by the Kogito pipelines.
*
-* The main part of Jenkins job generation is defined into the
https://github.com/kiegroup/kogito-pipelines repository.
+* The main part of Jenkins job generation is defined into the
https://github.com/apache/incubator-kie-kogito-pipelines repository.
*
* This file is making use of shared libraries defined in
-*
https://github.com/kiegroup/kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
+*
https://github.com/apache/incubator-kie-kogito-pipelines/tree/main/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl.
*/
import org.kie.jenkins.jobdsl.model.JobType
@@ -37,12 +37,11 @@ setupExamplesImagesPromoteJob(JobType.RELEASE)
void setupProfilingJob() {
def jobParams = JobParamsUtils.getBasicJobParamsWithEnv(this,
'kogito-operator-profiling', JobType.NIGHTLY, 'sonarcloud',
"${jenkins_path}/Jenkinsfile.profiling", 'Kogito Cloud Operator Profiling')
- JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+ JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.triggers = [ cron : '@midnight' ]
jobParams.env.putAll([
JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- REPO_NAME: 'kogito-operator',
OPERATOR_IMAGE_NAME: 'kogito-operator-profiling',
MAX_REGISTRY_RETRIES: 3,
OPENSHIFT_API_KEY: 'OPENSHIFT_API',
@@ -60,10 +59,9 @@ void setupProfilingJob() {
void createSetupBranchJob() {
def jobParams = JobParamsUtils.getBasicJobParams(this, 'kogito-operator',
JobType.SETUP_BRANCH, "${jenkins_path}/Jenkinsfile.setup-branch", 'Kogito Cloud
Operator Init Branch')
- JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+ JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.env.putAll([
JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- REPO_NAME: 'kogito-operator',
GIT_AUTHOR: "${GIT_AUTHOR_NAME}",
AUTHOR_CREDS_ID: "${GIT_AUTHOR_CREDENTIALS_ID}",
GITHUB_TOKEN_CREDS_ID: "${GIT_AUTHOR_TOKEN_CREDENTIALS_ID}",
@@ -85,7 +83,7 @@ void createSetupBranchJob() {
void setupDeployJob(JobType jobType) {
def jobParams = JobParamsUtils.getBasicJobParams(this,
'kogito-operator-deploy', jobType, "${jenkins_path}/Jenkinsfile.deploy",
'Kogito Cloud Operator Deploy')
- JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+ JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.env.putAll([
JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
@@ -127,7 +125,7 @@ void setupDeployJob(JobType jobType) {
// Deploy information
booleanParam('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('IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Image registry credentials to
use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+ stringParam('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('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image
registry to use to deploy images')
stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image
namespace to use to deploy images')
stringParam('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.')
@@ -161,10 +159,10 @@ void setupDeployJob(JobType jobType) {
void setupPromoteJob(JobType jobType) {
def jobParams = JobParamsUtils.getBasicJobParams(this,
'kogito-operator-promote', jobType, "${jenkins_path}/Jenkinsfile.promote",
'Kogito Cloud Operator Promote')
+ JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.env.putAll([
JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- REPO_NAME: 'kogito-operator',
MAX_REGISTRY_RETRIES: 3,
OPENSHIFT_API_KEY: 'OPENSHIFT_API',
OPENSHIFT_CREDS_KEY: 'OPENSHIFT_CREDS',
@@ -186,7 +184,7 @@ void setupPromoteJob(JobType jobType) {
// Base information which can override `deployment.properties`
booleanParam('BASE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Override
`deployment.properties`. Set to true if base image should be deployed in
Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS,
BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
- stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Override
`deployment.properties`. Base Image registry credentials to use to deploy
images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
+ stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Override `deployment.properties`. Base
Image registry credentials to use to deploy images. Will be ignored if no
BASE_IMAGE_REGISTRY is given')
stringParam('BASE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}",
'Override `deployment.properties`. Base image registry')
stringParam('BASE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}",
'Override `deployment.properties`. Base image namespace')
stringParam('BASE_IMAGE_NAME_SUFFIX', '', 'Override
`deployment.properties`. Base image name suffix')
@@ -194,7 +192,7 @@ void setupPromoteJob(JobType jobType) {
// Promote information
booleanParam('PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set
to true if base image should be deployed in Openshift registry.In this case,
PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and
PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
- stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Promote Image registry
credentials to use to deploy images. Will be ignored if no
PROMOTE_IMAGE_REGISTRY is given')
+ stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Promote Image registry credentials to
use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
stringParam('PROMOTE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}",
'Promote image registry')
stringParam('PROMOTE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}",
'Promote image namespace')
stringParam('PROMOTE_IMAGE_NAME_SUFFIX', '', 'Promote image name
suffix')
@@ -212,7 +210,7 @@ void setupPromoteJob(JobType jobType) {
void setupExamplesImagesDeployJob(JobType jobType, String jobName =
'kogito-examples-images-deploy', Map extraEnv = [:]) {
def jobParams = JobParamsUtils.getBasicJobParams(this, jobName, jobType,
"${jenkins_path}/Jenkinsfile.examples-images.deploy", 'Kogito Examples Images
Deploy')
- JobParamsUtils.setupJobParamsDefaultMavenConfiguration(this, jobParams)
+ JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.env.putAll(extraEnv)
if (jobType == JobType.PULL_REQUEST) {
jobParams.git.branch = '${BUILD_BRANCH_NAME}'
@@ -222,7 +220,6 @@ void setupExamplesImagesDeployJob(JobType jobType, String
jobName = 'kogito-exam
jobParams.env.putAll([
JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- REPO_NAME: 'kogito-operator',
MAX_REGISTRY_RETRIES: 3,
OPENSHIFT_API_KEY: 'OPENSHIFT_API',
OPENSHIFT_CREDS_KEY: 'OPENSHIFT_CREDS',
@@ -261,7 +258,7 @@ void setupExamplesImagesDeployJob(JobType jobType, String
jobName = 'kogito-exam
// Deploy information
booleanParam('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('IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Image registry credentials to
use to deploy images. Will be ignored if no IMAGE_REGISTRY is given')
+ stringParam('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('IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}", 'Image
registry to use to deploy images')
stringParam('IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}", 'Image
namespace to use to deploy images')
stringParam('IMAGE_NAME_PREFIX', '', 'Image name prefix to use to
deploy images. In case you need to change the final image name, you can add a
prefix to it.')
@@ -283,10 +280,10 @@ void setupExamplesImagesDeployJob(JobType jobType, String
jobName = 'kogito-exam
void setupExamplesImagesPromoteJob(JobType jobType) {
def jobParams = JobParamsUtils.getBasicJobParams(this,
'kogito-examples-images-promote', jobType,
"${jenkins_path}/Jenkinsfile.examples-images.promote", 'Kogito Examples Images
Promote')
+ JobParamsUtils.setupJobParamsAgentDockerBuilderImageConfiguration(this,
jobParams)
jobParams.env.putAll([
JENKINS_EMAIL_CREDS_ID: "${JENKINS_EMAIL_CREDS_ID}",
- REPO_NAME: 'kogito-operator',
MAX_REGISTRY_RETRIES: 3,
OPENSHIFT_API_KEY: 'OPENSHIFT_API',
OPENSHIFT_CREDS_KEY: 'OPENSHIFT_CREDS',
@@ -305,7 +302,7 @@ void setupExamplesImagesPromoteJob(JobType jobType) {
// Base information which can override `deployment.properties`
booleanParam('BASE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Override
`deployment.properties`. Set to true if base image should be deployed in
Openshift registry.In this case, BASE_IMAGE_REGISTRY_CREDENTIALS,
BASE_IMAGE_REGISTRY and BASE_IMAGE_NAMESPACE parameters will be ignored')
- stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Override
`deployment.properties`. Base Image registry credentials to use to deploy
images. Will be ignored if no BASE_IMAGE_REGISTRY is given')
+ stringParam('BASE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Override `deployment.properties`. Base
Image registry credentials to use to deploy images. Will be ignored if no
BASE_IMAGE_REGISTRY is given')
stringParam('BASE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}",
'Override `deployment.properties`. Base image registry')
stringParam('BASE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}",
'Override `deployment.properties`. Base image namespace')
stringParam('BASE_IMAGE_NAME_PREFIX', '', 'Override
`deployment.properties`. Base image name prefix')
@@ -315,7 +312,7 @@ void setupExamplesImagesPromoteJob(JobType jobType) {
// Promote information
booleanParam('PROMOTE_IMAGE_USE_OPENSHIFT_REGISTRY', false, 'Set
to true if base image should be deployed in Openshift registry.In this case,
PROMOTE_IMAGE_REGISTRY_CREDENTIALS, PROMOTE_IMAGE_REGISTRY and
PROMOTE_IMAGE_NAMESPACE parameters will be ignored')
- stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS_NIGHTLY}", 'Promote Image registry
credentials to use to deploy images. Will be ignored if no
PROMOTE_IMAGE_REGISTRY is given')
+ stringParam('PROMOTE_IMAGE_REGISTRY_CREDENTIALS',
"${CLOUD_IMAGE_REGISTRY_CREDENTIALS}", 'Promote Image registry credentials to
use to deploy images. Will be ignored if no PROMOTE_IMAGE_REGISTRY is given')
stringParam('PROMOTE_IMAGE_REGISTRY', "${CLOUD_IMAGE_REGISTRY}",
'Promote image registry')
stringParam('PROMOTE_IMAGE_NAMESPACE', "${CLOUD_IMAGE_NAMESPACE}",
'Promote image namespace')
stringParam('PROMOTE_IMAGE_NAME_PREFIX', '', 'Promote image name
prefix')
diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
index ad8af34a..2d518eb9 100755
--- a/.ci/jenkins/dsl/test.sh
+++ b/.ci/jenkins/dsl/test.sh
@@ -1,6 +1,6 @@
#!/bin/bash -e
file=$(mktemp)
# For more usage of the script, use ./test.sh -h
-curl -o ${file}
https://raw.githubusercontent.com/kiegroup/kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
+curl -o ${file}
https://raw.githubusercontent.com/apache/incubator-kie-kogito-pipelines/main/dsl/seed/scripts/seed_test.sh
chmod u+x ${file}
${file} $@
\ No newline at end of file
diff --git a/.ci/jenkins/scripts/container.groovy
b/.ci/jenkins/scripts/container.groovy
index 96526a50..a88d05ef 100644
--- a/.ci/jenkins/scripts/container.groovy
+++ b/.ci/jenkins/scripts/container.groovy
@@ -1,7 +1,7 @@
containerOpenshift = null
-containerEngine = 'podman'
-containerTlsOptions = '--tls-verify=false'
+containerEngine = 'docker'
+containerTlsOptions = ''
void pullImage(String image) {
retry(env.MAX_REGISTRY_RETRIES ?: 1) {
diff --git a/.ci/jenkins/scripts/helper.groovy
b/.ci/jenkins/scripts/helper.groovy
index 8b1c0ed4..886b8dff 100644
--- a/.ci/jenkins/scripts/helper.groovy
+++ b/.ci/jenkins/scripts/helper.groovy
@@ -15,7 +15,7 @@ void initPipeline() {
container = load '.ci/jenkins/scripts/container.groovy'
container.containerEngine = env.CONTAINER_ENGINE
- container.containerTlsOptions = env.CONTAINER_TLS_OPTIONS ?: ''
+ container.containerTlsOptions = env.CONTAINER_ENGINE_TLS_OPTIONS ?: ''
container.containerOpenshift = openshift
}
diff --git a/.github/bot-files/comments.yml b/.github/bot-files/comments.yml
index 7341f950..04db5ee1 100644
--- a/.github/bot-files/comments.yml
+++ b/.github/bot-files/comments.yml
@@ -2,7 +2,7 @@
# for now you'll need to difine every comment here, in the future comments
will be optional.
# please see the example for the file below
-prFirstTimeContributor: Welcome to the Kogito Community!. Please make sure
you've read the [contributors'
guide](https://github.com/kiegroup/kogito-operator/blob/main/README.md#contributing-to-the-kogito-operator)
+prFirstTimeContributor: Welcome to the Kogito Community!. Please make sure
you've read the [contributors'
guide](https://github.com/apache/incubator-kie-kogito-operator/blob/main/README.md#contributing-to-the-kogito-operator)
prCiTrigger: /jenkins test
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 69c2c346..87bb12ef 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -2,7 +2,7 @@ Many thanks for submitting your Pull Request :heart:!
Please make sure your PR meets the following requirements:
-- [ ] You have read the [contributors'
guide](https://github.com/kiegroup/kogito-operator/blob/main/README.md#contributing-to-the-kogito-operator)
+- [ ] You have read the [contributors'
guide](https://github.com/apache/incubator-kie-kogito-operator/blob/main/README.md#contributing-to-the-kogito-operator)
- [ ] Pull Request title is properly formatted: `[KOGITO-XYZ] Subject`
- [ ] Pull Request contains a link to the JIRA issue
- [ ] Pull Request contains a description of the issue
@@ -10,7 +10,7 @@ Please make sure your PR meets the following requirements:
- [ ] Your feature/bug fix has a unit test that verifies it
- [ ] You've ran `make before-pr` and everything is working accordingly
- [ ] You've tested the new feature/bug fix in an actual OpenShift cluster
-- [ ] You've added a
[RELEASE_NOTES.md](https://github.com/kiegroup/kogito-operator/blob/main/RELEASE_NOTES.md)
entry regarding this change
+- [ ] You've added a
[RELEASE_NOTES.md](https://github.com/apache/incubator-kie-kogito-operator/blob/main/RELEASE_NOTES.md)
entry regarding this change
<details>
<summary>
diff --git a/.github/workflows/jenkins-tests-PR.yml
b/.github/workflows/jenkins-tests-PR.yml
index bf3815cb..324a2deb 100644
--- a/.github/workflows/jenkins-tests-PR.yml
+++ b/.github/workflows/jenkins-tests-PR.yml
@@ -17,6 +17,6 @@ jobs:
- name: DSL tests
uses: kiegroup/kie-ci/.ci/actions/dsl-tests@main
with:
- main-config-file-repo: kiegroup/kogito-pipelines
+ main-config-file-repo: apache/incubator-kie-kogito-pipelines
main-config-file-path: .ci/jenkins/config/main.yaml
- branch-config-file-repo: kiegroup/kogito-pipelines
+ branch-config-file-repo: apache/incubator-kie-kogito-pipelines
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
