remove release build withRegistry wrapper (hyperledger-iroha#1428)

Signed-off-by: Artyom Bakhtin <[email protected]>
itorK · Jun 7, 2018 · b4a9bda · b4a9bda
1 parent c56398b
commit b4a9bda
Showing 1 changed file with 37 additions and 39 deletions.
diff --git a/.jenkinsci/release-build.groovy b/.jenkinsci/release-build.groovy
@@ -56,47 +56,45 @@ def doReleaseBuild() {
   sh "mv /tmp/${GIT_COMMIT}-${BUILD_NUMBER}/iroha.deb /tmp/${env.GIT_COMMIT}"
   sh "chmod +x /tmp/${env.GIT_COMMIT}/entrypoint.sh"
   iCRelease = docker.build("${DOCKER_REGISTRY_BASENAME}:${GIT_COMMIT}-${BUILD_NUMBER}-release", "--no-cache -f /tmp/${env.GIT_COMMIT}/Dockerfile /tmp/${env.GIT_COMMIT}")
-  docker.withRegistry('https://registry.hub.docker.com', 'docker-hub-credentials') {
-    if (env.GIT_LOCAL_BRANCH == 'develop') {
-      iCRelease.push("${platform}-develop")
-      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"])
-        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: '']
-          ])
-        withCredentials([usernamePassword(credentialsId: 'docker-hub-credentials', usernameVariable: 'login', passwordVariable: 'password')]) {
-          manifest.manifestPush("${DOCKER_REGISTRY_BASENAME}:develop", login, password)
-        }      
+  if (env.GIT_LOCAL_BRANCH == 'develop') {
+    iCRelease.push("${platform}-develop")
+    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"])
+      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: '']
+        ])
+      withCredentials([usernamePassword(credentialsId: 'docker-hub-credentials', usernameVariable: 'login', passwordVariable: 'password')]) {
+        manifest.manifestPush("${DOCKER_REGISTRY_BASENAME}:develop", login, password)
       }
     }
-    else if (env.GIT_LOCAL_BRANCH == 'master') {
-      iCRelease.push("${platform}-latest")
-      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"])
-        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: '']
-          ])
-        withCredentials([usernamePassword(credentialsId: 'docker-hub-credentials', usernameVariable: 'login', passwordVariable: 'password')]) {
-          manifest.manifestPush("${DOCKER_REGISTRY_BASENAME}:latest", login, password)
-        }      
+  }
+  else if (env.GIT_LOCAL_BRANCH == 'master') {
+    iCRelease.push("${platform}-latest")
+    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"])
+      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: '']
+        ])
+      withCredentials([usernamePassword(credentialsId: 'docker-hub-credentials', usernameVariable: 'login', passwordVariable: 'password')]) {
+        manifest.manifestPush("${DOCKER_REGISTRY_BASENAME}:latest", login, password)
       }
     }
   }