Browse Source

Update the CI pipeline

- Pull images from quay instead of docker hub as we run into the docker
hub limit otherwise.

- Update the Fedora images pulled to use newer, maintained, up to date
ones

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
Pierre-Yves Chibon 3 years ago
parent
commit
2886f2be9a

+ 2 - 2
.cico.pipeline

@@ -71,7 +71,7 @@ node('pagure') {
         throw e
     } finally {
         stage('Sync Artifacts'){
-            syncfromduffynode('pagure/results_f31-rpms-py3/')
+            syncfromduffynode('pagure/results_fedora-rpms-py3/')
             syncfromduffynode('pagure/results_centos7-rpms-py2/')
             syncfromduffynode('pagure/results_fedora-pip-py3/')
         }
@@ -86,7 +86,7 @@ node('pagure') {
         }
 
         stage('Archive Artifacts'){
-            archiveArtifacts artifacts: 'pagure/results_f31-rpms-py3/'
+            archiveArtifacts artifacts: 'pagure/results_fedora-rpms-py3/'
             archiveArtifacts artifacts: 'pagure/results_centos7-rpms-py2/'
             archiveArtifacts artifacts: 'pagure/results_fedora-pip-py3/'
         }

+ 1 - 1
dev/containers/fedora-pip-py3

@@ -1,4 +1,4 @@
-FROM fedora:30
+FROM quay.io/fedora/fedora:33
 
 ARG repo=https://pagure.io/pagure.git
 ARG branch=master

+ 1 - 1
dev/containers/f31-rpms-py3 → dev/containers/fedora-rpms-py3

@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM quay.io/fedora/fedora:32
 
 ARG repo=https://pagure.io/pagure.git
 ARG branch=master

+ 4 - 4
dev/run-tests-container.py

@@ -66,19 +66,19 @@ if __name__ == "__main__":
         container_names = ["pagure-c7-rpms-py2"]
         container_files = ["centos7-rpms-py2"]
     elif args.fedora is True:
-        container_names = ["pagure-f31-rpms-py3"]
-        container_files = ["f31-rpms-py3"]
+        container_names = ["pagure-fedora-rpms-py3"]
+        container_files = ["fedora-rpms-py3"]
     elif args.pip is True:
         container_names = ["pagure-fedora-pip-py3"]
         container_files = ["fedora-pip-py3"]
     else:
         container_names = [
-            "pagure-f31-rpms-py3",
+            "pagure-fedora-rpms-py3",
             "pagure-c7-rpms-py2",
             "pagure-fedora-pip-py3",
         ]
         container_files = [
-            "f31-rpms-py3",
+            "fedora-rpms-py3",
             "centos7-rpms-py2",
             "fedora-pip-py3",
         ]

+ 7 - 7
run_ci_tests_containers.sh

@@ -21,19 +21,19 @@ echo "Last commits:"
 git --no-pager log -2
 fi
 
-podman build --rm -t pagure-f31-rpms-py3 \
-    -f dev/containers/f31-rpms-py3 \
+podman build --rm -t pagure-fedora-rpms-py3 \
+    -f dev/containers/fedora-rpms-py3 \
     dev/containers
 
-if [ ! -d `pwd`/results_f31-rpms-py3 ]; then
-  mkdir `pwd`/results_f31-rpms-py3;
+if [ ! -d `pwd`/results_fedora-rpms-py3 ]; then
+  mkdir `pwd`/results_fedora-rpms-py3;
 fi
 
-podman run --rm -it --name pagure-f31-rpms-py3 \
-    -v `pwd`/results_f31-rpms-py3:/pagure/results:z \
+podman run --rm -it --name pagure-fedora-rpms-py3 \
+    -v `pwd`/results_fedora-rpms-py3:/pagure/results:z \
     -e BRANCH=$BRANCH \
     -e REPO=$REPO \
-    pagure-f31-rpms-py3
+    pagure-fedora-rpms-py3
 
 
 podman build --rm -t pagure-c7-rpms-py2 \