From 3b50963ad66e993f6f7cce0a3488a035a78cb875 Mon Sep 17 00:00:00 2001 From: Rodrigo Antunes Date: Tue, 25 Jun 2024 16:55:19 -0300 Subject: [PATCH] Remove quay.io references --- .ci/jenkins/Jenkinsfile.promote | 10 ++++------ .ci/jenkins/scripts/imageUtils.groovy | 17 ----------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/.ci/jenkins/Jenkinsfile.promote b/.ci/jenkins/Jenkinsfile.promote index 752034412b..ea346cee3d 100644 --- a/.ci/jenkins/Jenkinsfile.promote +++ b/.ci/jenkins/Jenkinsfile.promote @@ -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/scripts/imageUtils.groovy b/.ci/jenkins/scripts/imageUtils.groovy index 1c92cc5d4e..ee29baac31 100644 --- a/.ci/jenkins/scripts/imageUtils.groovy +++ b/.ci/jenkins/scripts/imageUtils.groovy @@ -71,21 +71,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 \ No newline at end of file