[CI] Move to new containers for full build (#3505)

1 files changed, 14 insertions, 15 deletions

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index ecdf4764b..7fd6e5c6b 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -81,7 +81,7 @@ pipeline {
       agent {
         docker {
           label 'docker'
-          image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
+          image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
           args "${DOCKER_ARGS}"
           registryUrl 'https://docker.io/'
           registryCredentialsId 'dockerhub_creds'
@@ -199,7 +199,7 @@ pipeline {
         stage('CentOS 7') {
           agent {
             docker {
-              image 'couchdbdev/centos-7-erlang-20.3.8.25-1:latest'
+              image 'apache/couchdbci-centos:7-erlang-20.3.8.26-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -245,7 +245,7 @@ pipeline {
         stage('CentOS 8') {
           agent {
             docker {
-              image 'couchdbdev/centos-8-erlang-20.3.8.25-1:latest'
+              image 'apache/couchdbci-centos:8-erlang-20.3.8.26-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -291,7 +291,7 @@ pipeline {
         stage('Ubuntu Xenial') {
           agent {
             docker {
-              image 'couchdbdev/ubuntu-xenial-erlang-20.3.8.25-1:latest'
+              image 'apache/couchdbci-ubuntu:xenial-erlang-20.3.8.26-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -336,7 +336,7 @@ pipeline {
         stage('Ubuntu Bionic') {
           agent {
             docker {
-              image 'couchdbdev/ubuntu-bionic-erlang-20.3.8.25-1:latest'
+              image 'apache/couchdbci-ubuntu:bionic-erlang-20.3.8.26-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -381,7 +381,7 @@ pipeline {
         stage('Ubuntu Focal') {
           agent {
             docker {
-              image 'couchdbdev/ubuntu-focal-erlang-20.3.8.25-1:latest'
+              image 'apache/couchdbci-ubuntu:focal-erlang-20.3.8.26-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -426,7 +426,7 @@ pipeline {
         stage('Debian Stretch') {
           agent {
             docker {
-              image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
+              image 'apache/couchdbci-debian:stretch-erlang-20.3.8.26-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -471,7 +471,7 @@ pipeline {
         stage('Debian Buster amd64') {
           agent {
             docker {
-              image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
+              image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -517,7 +517,7 @@ pipeline {
           when { expression { return false } }
           agent {
             docker {
-              image 'couchdbdev/arm64v8-debian-buster-erlang-20.3.8.25-1:latest'
+              image 'apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1'
               label 'arm64v8'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -566,7 +566,7 @@ pipeline {
 //        stage('Debian Buster ppc64le') {
 //          agent {
 //            docker {
-//              image 'couchdbdev/ppc64le-debian-buster-erlang-20.3.8.25-1:latest'
+//              image 'apache/couchdbci-debian:ppc64le-buster-erlang-20.3.8.26-1'
 //              label 'ppc64le'
 //              args "${DOCKER_ARGS}"
 //              registryUrl 'https://docker.io/'
@@ -636,12 +636,12 @@ pipeline {
             }
             stage('Pull latest docker image') {
               steps {
-                sh "docker pull couchdbdev/arm64v8-debian-buster-erlang-20.3.8.25-1:latest"
+                sh "docker pull apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1"
               }
             }
             stage('Build from tarball & test & packages') {
               steps {
-                withDockerContainer(image: "couchdbdev/arm64v8-debian-buster-erlang-20.3.8.25-1:latest", args: "${DOCKER_ARGS}") {
+                withDockerContainer(image: "apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1", args: "${DOCKER_ARGS}") {
                   unstash 'tarball'
                   withEnv(['MIX_HOME='+pwd(), 'HEX_HOME='+pwd()]) {
                     sh( script: build_and_test )
@@ -681,7 +681,7 @@ pipeline {
 
       agent {
         docker {
-          image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
+          image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
           label 'docker'
           args "${DOCKER_ARGS}"
           registryUrl 'https://docker.io/'
@@ -725,8 +725,7 @@ pipeline {
           sh '''
             cp js/centos-7/*rpm pkgs/centos7
             cp js/centos-8/*rpm pkgs/centos8
-            cd pkgs
-            cd centos7 && createrepo --database .
+            cd pkgs/centos7 && createrepo --database .
             cd ../centos8 && createrepo --database .
           '''