Change singlehost test container to centos7

Signed-off-by: Johnny Bieren <[email protected]>
johnbieren · Jul 3, 2018 · d17930b · d17930b
1 parent 74f0693
commit d17930b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/config/Dockerfiles/singlehost-test/Dockerfile b/config/Dockerfiles/singlehost-test/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:27
+FROM centos:7
 LABEL maintainer "https://github.com/CentOS-PaaS-SIG/ci-pipeline"
 LABEL description="This container is meant to \
 use dist-git tests to test packages, \
@@ -8,27 +8,29 @@ upstreamfirst.fedorainfracloud.org. It also can run \
 integration tests from the projectatomic repo by calling \
 the integration-test.sh script."
 
+# Install epel
+RUN yum -y install epel-release && yum clean all
+
 # Copy restraint repo into container
-RUN curl -o /etc/yum.repos.d/bpeck-restraint-fedora-27.repo https://copr.fedorainfracloud.org/coprs/bpeck/restraint/repo/fedora-27/bpeck-restraint-fedora-27.repo
+RUN curl -o /etc/yum.repos.d/bpeck-restraint-el7.repo https://bpeck.fedorapeople.org/restraint/el7.repo
 
 # Install all package requirements
-RUN for i in {1..5} ; do dnf -y install ansible \
+RUN yum -y install ansible \
         beakerlib \
         curl \
         dnf-plugins-core \
         file \
         findutils \
         git \
         libselinux-python \
-        python2-dnf \
+        python-dnf \
         qemu-kvm \
         restraint-rhts \
         rsync \
         standard-test-roles \
         sudo \
         wget \
-        && dnf clean all \
-        && break || sleep 10 ; done
+        && yum clean all \
 
 #Run dnf -y install standard-test-roles \
 #        --enablerepo=updates-testing \

diff --git a/config/Dockerfiles/singlehost-test/package-test.sh b/config/Dockerfiles/singlehost-test/package-test.sh
@@ -21,7 +21,7 @@ rm -rf ${TEST_ARTIFACTS}
 mkdir -p ${TEST_ARTIFACTS}
 
 # It was requested that these tests be run with latest rpm of standard-test-roles
-dnf update -y standard-test-roles
+yum update -y standard-test-roles
 rpm -q standard-test-roles
 
 # Invoke tests according to section 1.7.2 here:

diff --git a/config/Dockerfiles/singlehost-test/verify-rpm.sh b/config/Dockerfiles/singlehost-test/verify-rpm.sh
@@ -11,7 +11,7 @@ if [ -z "${TEST_SUBJECTS}" ]; then
     exit 1
 fi
 
-dnf update -y standard-test-roles
+yum update -y standard-test-roles
 rpm -q standard-test-roles
 
 set +u