From b7913eee2e2d29ab89c380d3c033a1b8444877ce Mon Sep 17 00:00:00 2001
From: Jonathan Dieter <jdieter@gmail.com>
Date: Sat, 16 Nov 2019 20:15:05 +0000
Subject: [PATCH] Problems with testing on CentOS 8, so switch back to 7

Signed-off-by: Jonathan Dieter <jdieter@gmail.com>
---
 Jenkinsfile                                           | 4 ++--
 autotest/{centos-latest => centos-7}/build.sh         | 8 ++++----
 autotest/{centos-latest => centos-7}/build/Dockerfile | 2 +-
 autotest/centos-7/prep.sh                             | 7 +++++++
 autotest/{centos-latest => centos-7}/prep/Dockerfile  | 2 +-
 autotest/{centos-latest => centos-7}/test.sh          | 4 ++--
 autotest/centos-latest/prep.sh                        | 7 -------
 prep-Jenkinsfile                                      | 2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)
 rename autotest/{centos-latest => centos-7}/build.sh (56%)
 rename autotest/{centos-latest => centos-7}/build/Dockerfile (83%)
 create mode 100755 autotest/centos-7/prep.sh
 rename autotest/{centos-latest => centos-7}/prep/Dockerfile (90%)
 rename autotest/{centos-latest => centos-7}/test.sh (82%)
 delete mode 100755 autotest/centos-latest/prep.sh

diff --git a/Jenkinsfile b/Jenkinsfile
index 522cd2c..4e7785a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,7 @@ node {
             sh "./autotest/fedora-latest/build.sh"
         },
         centos: {
-            sh "./autotest/centos-latest/build.sh"
+            sh "./autotest/centos-7/build.sh"
         },
         opensuse: {
             sh "./autotest/opensuse-leap/build.sh"
@@ -24,7 +24,7 @@ node {
             sh "./autotest/fedora-latest/test.sh"
         },
         centos: {
-            sh "./autotest/centos-latest/test.sh"
+            sh "./autotest/centos-7/test.sh"
         },
         opensuse: {
             sh "./autotest/opensuse-leap/test.sh"
diff --git a/autotest/centos-latest/build.sh b/autotest/centos-7/build.sh
similarity index 56%
rename from autotest/centos-latest/build.sh
rename to autotest/centos-7/build.sh
index 02aef2c..3064cdd 100755
--- a/autotest/centos-latest/build.sh
+++ b/autotest/centos-7/build.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
-# Build zchunk-centos:latest if it doesn't exist
-HAVE_IMAGE=$(docker image ls -q zchunk-centos:latest)
+# Build zchunk-centos:7 if it doesn't exist
+HAVE_IMAGE=$(docker image ls -q zchunk-centos:7)
 if [ "$HAVE_IMAGE" == "" ]; then
-	autotest/centos-latest/prep.sh
+	autotest/centos-7/prep.sh
 	if [ "$?" -ne 0 ]; then
 		exit 1
 	fi
 fi
 docker image rm zchunk-centos:test -f 2>/dev/null 1>/dev/null
-docker image build -t zchunk-centos:test --file autotest/centos-latest/build/Dockerfile ./
+docker image build -t zchunk-centos:test --file autotest/centos-7/build/Dockerfile ./
 
diff --git a/autotest/centos-latest/build/Dockerfile b/autotest/centos-7/build/Dockerfile
similarity index 83%
rename from autotest/centos-latest/build/Dockerfile
rename to autotest/centos-7/build/Dockerfile
index 96a6ccd..3f39e3e 100644
--- a/autotest/centos-latest/build/Dockerfile
+++ b/autotest/centos-7/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM zchunk-centos:latest
+FROM zchunk-centos:7
 ADD ./ /code
 WORKDIR /code
 RUN meson build --auto-features=enabled && cd build && ninja-build
diff --git a/autotest/centos-7/prep.sh b/autotest/centos-7/prep.sh
new file mode 100755
index 0000000..a5e8098
--- /dev/null
+++ b/autotest/centos-7/prep.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+docker pull centos:7
+if [ "$?" -ne 0 ]; then
+        exit 1
+fi
+docker image rm -f zchunk-centos:7 2>/dev/null 1>/dev/null
+docker image build -t zchunk-centos:7 --file autotest/centos-7/prep/Dockerfile ./
diff --git a/autotest/centos-latest/prep/Dockerfile b/autotest/centos-7/prep/Dockerfile
similarity index 90%
rename from autotest/centos-latest/prep/Dockerfile
rename to autotest/centos-7/prep/Dockerfile
index 7dd2377..d06cc9c 100644
--- a/autotest/centos-latest/prep/Dockerfile
+++ b/autotest/centos-7/prep/Dockerfile
@@ -1,2 +1,2 @@
-FROM centos:latest
+FROM centos:7
 RUN yum -y install epel-release && yum -y update epel-release && yum -y install meson gcc "pkgconfig(libzstd)" "pkgconfig(libcurl)" "pkgconfig(openssl)" && rm -rf /var/cache/yum
diff --git a/autotest/centos-latest/test.sh b/autotest/centos-7/test.sh
similarity index 82%
rename from autotest/centos-latest/test.sh
rename to autotest/centos-7/test.sh
index dd547c4..8034035 100755
--- a/autotest/centos-latest/test.sh
+++ b/autotest/centos-7/test.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-# Build zchunk-centos:latest if it doesn't exist
+# Build zchunk-centos:7 if it doesn't exist
 HAVE_IMAGE=$(docker image ls -q zchunk-centos:test)
 if [ "$HAVE_IMAGE" == "" ]; then
-	autotest/centos-latest/build.sh
+	autotest/centos-7/build.sh
 	if [ "$?" -ne 0 ]; then
 		exit 1
 	fi
diff --git a/autotest/centos-latest/prep.sh b/autotest/centos-latest/prep.sh
deleted file mode 100755
index a565d3d..0000000
--- a/autotest/centos-latest/prep.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-docker pull centos:latest
-if [ "$?" -ne 0 ]; then
-        exit 1
-fi
-docker image rm -f zchunk-centos:latest 2>/dev/null 1>/dev/null
-docker image build -t zchunk-centos:latest --file autotest/centos-latest/prep/Dockerfile ./
diff --git a/prep-Jenkinsfile b/prep-Jenkinsfile
index e482f7c..6b67e1e 100644
--- a/prep-Jenkinsfile
+++ b/prep-Jenkinsfile
@@ -2,7 +2,7 @@ node {
     checkout scm
     stage('Prep') {
         sh "./autotest/fedora-latest/prep.sh"
-        sh "./autotest/centos-latest/prep.sh"
+        sh "./autotest/centos-7/prep.sh"
         sh "./autotest/opensuse-leap/prep.sh"
         sh "./autotest/debian-latest/prep.sh"
         sh "./autotest/ubuntu-rolling/prep.sh"
-- 
2.30.2