Build Jenkins minimum Erlang version to 21.3.8.22

This will require new base images to be uploaded to Docker Hub before
the PR is merged.

2 files changed, 15 insertions, 15 deletions

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 7fd6e5c6b..c470164a0 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -81,7 +81,7 @@ pipeline {
       agent {
         docker {
           label 'docker'
-          image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
+          image 'apache/couchdbci-debian:buster-erlang-21.3.8.22-1'
           args "${DOCKER_ARGS}"
           registryUrl 'https://docker.io/'
           registryCredentialsId 'dockerhub_creds'
@@ -199,7 +199,7 @@ pipeline {
         stage('CentOS 7') {
           agent {
             docker {
-              image 'apache/couchdbci-centos:7-erlang-20.3.8.26-1'
+              image 'apache/couchdbci-centos:7-erlang-21.3.8.22-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -245,7 +245,7 @@ pipeline {
         stage('CentOS 8') {
           agent {
             docker {
-              image 'apache/couchdbci-centos:8-erlang-20.3.8.26-1'
+              image 'apache/couchdbci-centos:8-erlang-21.3.8.22-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -291,7 +291,7 @@ pipeline {
         stage('Ubuntu Xenial') {
           agent {
             docker {
-              image 'apache/couchdbci-ubuntu:xenial-erlang-20.3.8.26-1'
+              image 'apache/couchdbci-ubuntu:xenial-erlang-21.3.8.22-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -336,7 +336,7 @@ pipeline {
         stage('Ubuntu Bionic') {
           agent {
             docker {
-              image 'apache/couchdbci-ubuntu:bionic-erlang-20.3.8.26-1'
+              image 'apache/couchdbci-ubuntu:bionic-erlang-21.3.8.22-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -381,7 +381,7 @@ pipeline {
         stage('Ubuntu Focal') {
           agent {
             docker {
-              image 'apache/couchdbci-ubuntu:focal-erlang-20.3.8.26-1'
+              image 'apache/couchdbci-ubuntu:focal-erlang-21.3.8.22-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -426,7 +426,7 @@ pipeline {
         stage('Debian Stretch') {
           agent {
             docker {
-              image 'apache/couchdbci-debian:stretch-erlang-20.3.8.26-1'
+              image 'apache/couchdbci-debian:stretch-erlang-21.3.8.22-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -471,7 +471,7 @@ pipeline {
         stage('Debian Buster amd64') {
           agent {
             docker {
-              image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
+              image 'apache/couchdbci-debian:buster-erlang-21.3.8.22-1'
               label 'docker'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -517,7 +517,7 @@ pipeline {
           when { expression { return false } }
           agent {
             docker {
-              image 'apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1'
+              image 'apache/couchdbci-debian:arm64v8-buster-erlang-21.3.8.22-1'
               label 'arm64v8'
               args "${DOCKER_ARGS}"
               registryUrl 'https://docker.io/'
@@ -566,7 +566,7 @@ pipeline {
 //        stage('Debian Buster ppc64le') {
 //          agent {
 //            docker {
-//              image 'apache/couchdbci-debian:ppc64le-buster-erlang-20.3.8.26-1'
+//              image 'apache/couchdbci-debian:ppc64le-buster-erlang-21.3.8.22-1'
 //              label 'ppc64le'
 //              args "${DOCKER_ARGS}"
 //              registryUrl 'https://docker.io/'
@@ -636,12 +636,12 @@ pipeline {
             }
             stage('Pull latest docker image') {
               steps {
-                sh "docker pull apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1"
+                sh "docker pull apache/couchdbci-debian:arm64v8-buster-erlang-21.3.8.22-1"
               }
             }
             stage('Build from tarball & test & packages') {
               steps {
-                withDockerContainer(image: "apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1", args: "${DOCKER_ARGS}") {
+                withDockerContainer(image: "apache/couchdbci-debian:arm64v8-buster-erlang-21.3.8.22-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 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
+          image 'apache/couchdbci-debian:buster-erlang-21.3.8.22-1'
           label 'docker'
           args "${DOCKER_ARGS}"
           registryUrl 'https://docker.io/'
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 8f9d6f1d7..77362b193 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -50,7 +50,7 @@ pipeline {
     // Search for ERLANG_VERSION
     // see https://issues.jenkins.io/browse/JENKINS-61047 for why this cannot
     // be done parametrically
-    LOW_ERLANG_VER = '20.3.8.26'
+    LOW_ERLANG_VER = '21.3.8.22'
   }
 
   options {
@@ -107,7 +107,7 @@ pipeline {
         axes {
           axis {
             name 'ERLANG_VERSION'
-            values '20.3.8.26', '21.3.8.22', '22.3.4.17', '23.3.1'
+            values '21.3.8.22', '22.3.4.17', '23.3.1'
           }
         }