Replace quay.io references

apache · May 27, 2024 · 5e48261 · 5e48261
1 parent 1c6a453
commit 5e48261
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 31 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote
@@ -32,7 +32,7 @@ imageUtils = null
 
 pipeline {
     agent {
-        docker { 
+        docker {
             image env.AGENT_DOCKER_BUILDER_IMAGE
             args env.AGENT_DOCKER_BUILDER_ARGS
             label util.avoidFaultyNodes()
@@ -112,7 +112,7 @@ pipeline {
         stage('Upload OptaPlanner documentation') {
             steps {
                 script {
-                    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]){
+                    configFileProvider([configFile(fileId: env.MAVEN_SETTINGS_CONFIG_FILE_ID, variable: 'MAVEN_SETTINGS_FILE')]) {
                         getMavenCommand()
                                 .inDirectory(optaplannerRepository)
                                 .skipTests(true)
@@ -150,7 +150,7 @@ pipeline {
 void sendErrorNotification() {
     if (params.SEND_NOTIFICATION) {
         String additionalInfo = "**[${getBuildBranch()}] Optaplanner - Promote**"
-        mailer.sendMarkdownTestSummaryNotification("CI failures", [env.OPTAPLANNER_CI_EMAIL_TO], additionalInfo)
+        mailer.sendMarkdownTestSummaryNotification('CI failures', [env.OPTAPLANNER_CI_EMAIL_TO], additionalInfo)
     } else {
         echo 'No notification sent per configuration'
     }
@@ -260,7 +260,7 @@ void uploadDistribution(String directory) {
                 // For testing, simulate connection via SSH:
                 // sh "ssh -i $SSH_KEY_JBOSS_FILEMGMT -oKexAlgorithms=+diffie-hellman-group1-sha1 [email protected]"
                 sh "./build/release/upload_distribution.sh ${getProjectVersion()} $SSH_KEY_JBOSS_FILEMGMT"
-            }
+                    }
         }
     } else {
         echo 'No uploadDistribution due to testing build'
@@ -316,10 +316,8 @@ void pushOperatorFinalImage() {
 }
 
 void removeOperatorImageTemporaryTag() {
-    if (!imageUtils.removeQuayTag(getOperatorImageNamespace(), getOperatorImageName(), getOperatorImageTemporaryTag())) {
-        String temporaryImageName = imageUtils.getImageFullName(getOperatorImageNamespace(), getOperatorImageName(),
-                getOperatorImageTemporaryTag())
-        error "Cannot remove the OptaPlanner Operator temporary image tag (${temporaryImageName}) from quay.io. "
-                + "The tag should be removed manually."
-    }
+    String temporaryImageName = imageUtils.getImageFullName(getOperatorImageNamespace(), getOperatorImageName(),
+            getOperatorImageTemporaryTag())
+    // https://docs.docker.com/docker-hub/api/latest/#tag/repositories
+    error "Dockerhub API does not allow deleting tags via API. The OptaPlanner Operator temporary image tag (${temporaryImageName}) should be removed manually."
 }
diff --git a/.ci/jenkins/config/branch.yaml b/.ci/jenkins/config/branch.yaml
@@ -79,9 +79,9 @@ maven:
     creds_id: apache-nexus-kie-deploy-credentials
 cloud:
   image:
-    registry_credentials: tradisso_registry_token # TODO set to `kogito-quay-token`
-    registry: quay.io
-    namespace: tradisso
+    registry_credentials: 'to_be_defined'
+    registry: docker.io
+    namespace: apache
     latest_git_branch: main
 jenkins:
   email_creds_id: OPTAPLANNER_CI_NOTIFICATION_EMAILS

diff --git a/.ci/jenkins/scripts/imageUtils.groovy b/.ci/jenkins/scripts/imageUtils.groovy
@@ -64,21 +64,4 @@ void pushImage(String image) {
     }
 }
 
-boolean removeQuayTag(String namespace, String imageName, String tag) {
-    String image = "quay.io/${namespace}/${imageName}:${tag}"
-    echo "Removing a temporary image tag ${image}"
-    try {
-        def output = 'false'
-        withCredentials([usernamePassword(credentialsId: getOperatorImageRegistryCredentials(), usernameVariable: 'QUAY_USER', passwordVariable: 'QUAY_TOKEN')]) {
-            output = sh(returnStdout: true, script: "curl -H 'Content-Type: application/json' -H 'Authorization: Bearer ${QUAY_TOKEN}' -X DELETE https://quay.io/api/v1/repository/${namespace}/${imageName}/tag/${tag}").trim()
-            if (output != '') {
-                echo "$output"
-            }
-        }
-        return output == ''
-    } catch (err) {
-        echo "[ERROR] Cannot remove a temporary image tag ${image}."
-    }
-}
-
-return this
+return this