diff --git a/Jenkinsfile b/Jenkinsfile index 449712a8e9..bb985bba47 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1173,9 +1173,9 @@ pipeline { script { release(INFRAPOOL_EXECUTORV2_AGENT_0) { billOfMaterialsDirectory, assetDirectory -> // Publish docker images - INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './publish-images.sh --edge --dockerhub' - INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh './publish-images.sh --edge --arch=arm64' - INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './publish-manifest.sh --edge' + // INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './publish-images.sh --edge --dockerhub' + // INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh './publish-images.sh --edge --arch=arm64' + // INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './publish-manifest.sh --edge' // Create deb and rpm packages (ARM64) INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh 'echo "CONJUR_VERSION=5" >> debify.env' diff --git a/publish-images.sh b/publish-images.sh index 93c56014e1..b668ab6e26 100755 --- a/publish-images.sh +++ b/publish-images.sh @@ -131,7 +131,7 @@ if [[ "${PROMOTE}" = true ]]; then # Push latest, 1.x.y, 1.x, and 1 images readarray -t prefix_versions < <(gen_versions "${VERSION}") - for version in latest "${prefix_versions[@]}"; do + for version in "${prefix_versions[@]}"; do echo "Pushing images for tag: $version-${ARCH}" tag_and_push "${version}-${ARCH}" "registry.tld/${IMAGE_NAME}:${LOCAL_TAG}-${ARCH}" "registry.tld/${IMAGE_NAME}" @@ -150,13 +150,13 @@ if [[ "${REDHAT}" = true ]]; then # Publish only the tag version to the Redhat container registry if docker login "${REDHAT_REGISTRY}" -u "${REDHAT_USER}" -p "${REDHAT_API_KEY}"; then # push image to red hat - tag_and_push "${VERSION}" "${RH_LOCAL_IMAGE}" "${REDHAT_REMOTE_IMAGE}" + tag_and_push "${VERSION}" "${RH_LOCAL_IMAGE}-${ARCH}" "${REDHAT_REMOTE_IMAGE}" # scan image with preflight tool scan_redhat_image "${REDHAT_REMOTE_IMAGE}:${VERSION}" "${REDHAT_CERT_PID}" # push latest tag to RH - tag_and_push "latest" "${RH_LOCAL_IMAGE}" "${REDHAT_REMOTE_IMAGE}" + tag_and_push "${RH_LOCAL_IMAGE}-${ARCH}" "${REDHAT_REMOTE_IMAGE}" else echo 'Failed to log in to quay.io' exit 1 diff --git a/publish-manifest.sh b/publish-manifest.sh index 4863e0b1d2..967c15d119 100755 --- a/publish-manifest.sh +++ b/publish-manifest.sh @@ -107,7 +107,7 @@ if [[ "${PROMOTE}" = true ]]; then # Push latest, 1.x.y, 1.x, and 1 manifests readarray -t prefix_versions < <(gen_versions "${VERSION}") - for version in latest "${prefix_versions[@]}"; do + for version in "${prefix_versions[@]}"; do echo "Preparing manifests for tag: $version" prepare_manifest "registry.tld/${IMAGE_NAME}" "${version}"