From f8b52011b60febbfd936d49cf1d22ae94aac211c Mon Sep 17 00:00:00 2001 From: Rodrigo Antunes Date: Fri, 23 Aug 2024 15:53:06 -0300 Subject: [PATCH 1/2] Do not push optaplanner operator image to dockerhub in the release job --- .ci/jenkins/Jenkinsfile.deploy | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy index 854766ca685..7ac2a021b4a 100644 --- a/.ci/jenkins/Jenkinsfile.deploy +++ b/.ci/jenkins/Jenkinsfile.deploy @@ -134,7 +134,7 @@ pipeline { withCredentials([usernamePassword(credentialsId: env.MAVEN_REPO_CREDS_ID, usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) { def installOrDeploy if (shouldDeployToRepository()) { - installOrDeploy = "deploy -DdeployAtEnd -Dapache.repository.username=${REPOSITORY_USER} -Dapache.repository.password=${REPOSITORY_TOKEN} -DretryFailedDeploymentCount=5" + installOrDeploy = "deploy -DdeployAtEnd -Dapache.repository.username=${REPOSITORY_USER} -Dapache.repository.password=${REPOSITORY_TOKEN} -DretryFailedDeploymentCount=5 -Dquarkus.bootstrap.effective-model-builder" } else { installOrDeploy = 'install' } @@ -227,22 +227,6 @@ pipeline { } } } - - stage('Push a temporary operator image to a registry') { - when { - expression { return isRelease() } - } - steps { - script { - pushOperatorTemporaryImage() - - // Store image deployment information - setDeployPropertyIfNeeded('operator.image.name', getOperatorImageName()) - setDeployPropertyIfNeeded('operator.image.tag', getOperatorImageTag()) - setDeployPropertyIfNeeded('operator.image.temporary_tag', getOperatorImageTemporaryTag()) - } - } - } } post { always { @@ -527,19 +511,6 @@ String getOperatorImageTag() { return params.OPERATOR_IMAGE_TAG ?: getProjectVersion() } -String getOperatorImageTemporaryTag() { - return "${getOperatorImageTag()}-temporary" -} - -void pushOperatorTemporaryImage() { - String localImage = "${getOperatorImageName()}:latest" - String temporaryImageTag = getOperatorImageTemporaryTag() - String temporaryImageFullName = imageUtils.getImageFullNameWithRegistry(getOperatorImageRegistry(), - getOperatorImageNamespace(), getOperatorImageName(), temporaryImageTag) - imageUtils.tagImage(localImage, temporaryImageFullName) - imageUtils.pushImage(temporaryImageFullName) -} - boolean isDeployDisabled() { return env.DISABLE_DEPLOY.toBoolean() } From 11e59aab550120273dfeee84bd991817a2f06960 Mon Sep 17 00:00:00 2001 From: Rodrigo Antunes Date: Fri, 23 Aug 2024 15:54:42 -0300 Subject: [PATCH 2/2] Do not push optaplanner operator image to dockerhub in the release job --- .ci/jenkins/Jenkinsfile.deploy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/jenkins/Jenkinsfile.deploy b/.ci/jenkins/Jenkinsfile.deploy index 7ac2a021b4a..2e2e111dccc 100644 --- a/.ci/jenkins/Jenkinsfile.deploy +++ b/.ci/jenkins/Jenkinsfile.deploy @@ -134,7 +134,7 @@ pipeline { withCredentials([usernamePassword(credentialsId: env.MAVEN_REPO_CREDS_ID, usernameVariable: 'REPOSITORY_USER', passwordVariable: 'REPOSITORY_TOKEN')]) { def installOrDeploy if (shouldDeployToRepository()) { - installOrDeploy = "deploy -DdeployAtEnd -Dapache.repository.username=${REPOSITORY_USER} -Dapache.repository.password=${REPOSITORY_TOKEN} -DretryFailedDeploymentCount=5 -Dquarkus.bootstrap.effective-model-builder" + installOrDeploy = "deploy -DdeployAtEnd -Dapache.repository.username=${REPOSITORY_USER} -Dapache.repository.password=${REPOSITORY_TOKEN} -DretryFailedDeploymentCount=5" } else { installOrDeploy = 'install' }