Skip to content

Commit

Permalink
CNJR-5954: Push internal versions (just exclude 'edge' tag)
Browse files Browse the repository at this point in the history
  • Loading branch information
szh committed Sep 18, 2024
1 parent 60d2af6 commit 157deee
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
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'
Expand Down
6 changes: 3 additions & 3 deletions publish-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ if [[ "${PUBLISH_EDGE}" = true ]]; then
tag_and_push "${VERSION}-${ARCH}" "${RH_LOCAL_IMAGE}" "registry.tld/conjur-ubi"

# Push image to internal registry
tag_and_push "edge-${ARCH}" "${LOCAL_IMAGE}" "registry.tld/${IMAGE_NAME}"
tag_and_push "edge-${ARCH}" "${RH_LOCAL_IMAGE}" "registry.tld/conjur-ubi"
# tag_and_push "edge-${ARCH}" "${LOCAL_IMAGE}" "registry.tld/${IMAGE_NAME}"
# tag_and_push "edge-${ARCH}" "${RH_LOCAL_IMAGE}" "registry.tld/conjur-ubi"

# Publish release specific and edge tags to dockerhub
if [[ "${DOCKERHUB}" = true ]]; then
echo "Pushing to DockerHub"

tag_and_push "${VERSION}" "${LOCAL_IMAGE}" "${IMAGE_NAME}"
tag_and_push "edge" "${LOCAL_IMAGE}" "${IMAGE_NAME}"
# tag_and_push "edge" "${LOCAL_IMAGE}" "${IMAGE_NAME}"
fi
fi

Expand Down

0 comments on commit 157deee

Please sign in to comment.