diff --git a/.jenkinsci/debug-build.groovy b/.jenkinsci/debug-build.groovy index 2bf7684dcf..1205d91ba6 100644 --- a/.jenkinsci/debug-build.groovy +++ b/.jenkinsci/debug-build.groovy @@ -28,17 +28,12 @@ def doDebugBuild(coverageEnabled=false) { // or it is a commit into PR which base branch is develop (usually develop -> master) if ((GIT_LOCAL_BRANCH == 'develop' || CHANGE_BRANCH_LOCAL == 'develop' || GIT_LOCAL_BRANCH == 'dev' || CHANGE_BRANCH_LOCAL == 'dev') && manifest.manifestSupportEnabled()) { manifest.manifestCreate("${DOCKER_REGISTRY_BASENAME}:develop-build", - ["${DOCKER_REGISTRY_BASENAME}:x86_64-develop-build", - "${DOCKER_REGISTRY_BASENAME}:armv7l-develop-build", - "${DOCKER_REGISTRY_BASENAME}:aarch64-develop-build"]) + ["${DOCKER_REGISTRY_BASENAME}:x86_64-develop-build"] + ) manifest.manifestAnnotate("${DOCKER_REGISTRY_BASENAME}:develop-build", [ [manifest: "${DOCKER_REGISTRY_BASENAME}:x86_64-develop-build", - arch: 'amd64', os: 'linux', osfeatures: [], variant: ''], - [manifest: "${DOCKER_REGISTRY_BASENAME}:armv7l-develop-build", - arch: 'arm', os: 'linux', osfeatures: [], variant: 'v7'], - [manifest: "${DOCKER_REGISTRY_BASENAME}:aarch64-develop-build", - arch: 'arm64', os: 'linux', osfeatures: [], variant: ''] + arch: 'amd64', os: 'linux', osfeatures: [], variant: ''] ]) withCredentials([usernamePassword(credentialsId: 'docker-hub-credentials', usernameVariable: 'login', passwordVariable: 'password')]) { manifest.manifestPush("${DOCKER_REGISTRY_BASENAME}:develop-build", login, password) diff --git a/.jenkinsci/release-build.groovy b/.jenkinsci/release-build.groovy index 0e958196ba..c98b7ce2cf 100644 --- a/.jenkinsci/release-build.groovy +++ b/.jenkinsci/release-build.groovy @@ -66,17 +66,11 @@ def doReleaseBuild() { } if (manifest.manifestSupportEnabled()) { manifest.manifestCreate("${DOCKER_REGISTRY_BASENAME}:develop", - ["${DOCKER_REGISTRY_BASENAME}:x86_64-develop", - "${DOCKER_REGISTRY_BASENAME}:armv7l-develop", - "${DOCKER_REGISTRY_BASENAME}:aarch64-develop"]) + ["${DOCKER_REGISTRY_BASENAME}:x86_64-develop"]) manifest.manifestAnnotate("${DOCKER_REGISTRY_BASENAME}:develop", [ [manifest: "${DOCKER_REGISTRY_BASENAME}:x86_64-develop", - arch: 'amd64', os: 'linux', osfeatures: [], variant: ''], - [manifest: "${DOCKER_REGISTRY_BASENAME}:armv7l-develop", - arch: 'arm', os: 'linux', osfeatures: [], variant: 'v7'], - [manifest: "${DOCKER_REGISTRY_BASENAME}:aarch64-develop", - arch: 'arm64', os: 'linux', osfeatures: [], variant: ''] + arch: 'amd64', os: 'linux', osfeatures: [], variant: ''] ]) withCredentials([usernamePassword(credentialsId: 'docker-hub-credentials', usernameVariable: 'login', passwordVariable: 'password')]) { manifest.manifestPush("${DOCKER_REGISTRY_BASENAME}:develop", login, password) @@ -89,17 +83,11 @@ def doReleaseBuild() { } if (manifest.manifestSupportEnabled()) { manifest.manifestCreate("${DOCKER_REGISTRY_BASENAME}:latest", - ["${DOCKER_REGISTRY_BASENAME}:x86_64-latest", - "${DOCKER_REGISTRY_BASENAME}:armv7l-latest", - "${DOCKER_REGISTRY_BASENAME}:aarch64-latest"]) + ["${DOCKER_REGISTRY_BASENAME}:x86_64-latest"]) manifest.manifestAnnotate("${DOCKER_REGISTRY_BASENAME}:latest", [ [manifest: "${DOCKER_REGISTRY_BASENAME}:x86_64-latest", - arch: 'amd64', os: 'linux', osfeatures: [], variant: ''], - [manifest: "${DOCKER_REGISTRY_BASENAME}:armv7l-latest", - arch: 'arm', os: 'linux', osfeatures: [], variant: 'v7'], - [manifest: "${DOCKER_REGISTRY_BASENAME}:aarch64-latest", - arch: 'arm64', os: 'linux', osfeatures: [], variant: ''] + arch: 'amd64', os: 'linux', osfeatures: [], variant: ''] ]) withCredentials([usernamePassword(credentialsId: 'docker-hub-credentials', usernameVariable: 'login', passwordVariable: 'password')]) { manifest.manifestPush("${DOCKER_REGISTRY_BASENAME}:latest", login, password)