Update repofile for Centos7

italiangrid · Aug 1, 2024 · abf39ba · abf39ba
1 parent 9a8a939
commit abf39ba
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,11 +10,13 @@ jobs:
 
     strategy:
       matrix:
-        rhel: [9]
+        rhel: [7, 9]
         repo: [stable, beta]
         exclude:
           - rhel: 9
             repo: stable
+          - rhel: 7
+            repo: beta
 
     runs-on: ubuntu-latest
 
@@ -44,11 +46,13 @@ jobs:
 
     strategy:
       matrix:
-        rhel: [9]
+        rhel: [7, 9]
         repo: [stable, beta]
         exclude:
           - rhel: 9
             repo: stable
+          - rhel: 7
+            repo: beta
 
     runs-on: ubuntu-latest
 
@@ -78,8 +82,8 @@ jobs:
 
     strategy:
       matrix:
-        client: [9-beta]
-        server: [9-beta]
+        client: [7-stable, 9-beta]
+        server: [7-stable, 9-beta]
 
     runs-on: ubuntu-latest
     continue-on-error: true

diff --git a/.github/workflows/voms-aa.ci.yml b/.github/workflows/voms-aa.ci.yml
@@ -8,8 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        client:
-          - 9-beta
+        client: [7-stable, 9-beta]
 
     runs-on: ubuntu-latest
 

diff --git a/compose/.env b/compose/.env
@@ -1,6 +1,6 @@
 COMPOSE_PROJECT_NAME=voms-testsuite
 TS_IMAGE=italiangrid/voms-testsuite:centos7-stable
-VOMS_IMAGE=italiangrid/voms:latest
+VOMS_IMAGE=italiangrid/voms:centos7-stable
 VOMS_ADMIN_IMAGE=italiangrid/voms-admin:latest
 NGINX_IMAGE=baltig.infn.it:4567/cnafsd/ngx_http_voms_module/nginx-httpg-voms
 NGINX_IMAGE_TAG=latest

diff --git a/docker/CentOS-Base.repo b/docker/CentOS-Base.repo
@@ -0,0 +1,24 @@
+[base]
+name=CentOS-$releasever - Base
+baseurl=http://vault.centos.org/7.9.2009/os/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+
+[updates]
+name=CentOS-$releasever - Updates
+baseurl=http://vault.centos.org/7.9.2009/updates/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+
+[extras]
+name=CentOS-$releasever - Extras
+baseurl=http://vault.centos.org/7.9.2009/extras/$basearch/
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
+
+[centosplus]
+name=CentOS-$releasever - Plus
+baseurl=http://vault.centos.org/7.9.2009/centosplus/$basearch/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
diff --git a/docker/testsuite/Dockerfile.centos7 b/docker/testsuite/Dockerfile.centos7
@@ -9,6 +9,7 @@ ARG VOMS_REPO=stable
 
 ENV VOMS_REPO_URL=https://italiangrid.github.io/voms-repo/repofiles/rhel/voms-${VOMS_REPO}-el${RHEL_VERSION}.repo
 
+COPY ../CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo
 COPY assets/scripts/*.sh /tmp/scripts/
 
 RUN yum install -y epel-release \

diff --git a/docker/voms/Dockerfile.centos7 b/docker/voms/Dockerfile.centos7
@@ -11,6 +11,7 @@ ARG UMD_RELEASE_PACKAGE_URL=http://repository.egi.eu/sw/production/umd/4/centos7
 
 ENV VOMS_REPO_URL=https://italiangrid.github.io/voms-repo/repofiles/rhel/voms-${VOMS_REPO}-el${RHEL_VERSION}.repo
 
+COPY ../CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo
 COPY assets/scripts/*.sh /tmp/scripts/
 
 RUN yum -y install hostname which wget tar sudo file less epel-release ${UMD_RELEASE_PACKAGE_URL} yum-utils
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,8 +8,7 @@ jobs: @@
         strategy:
           matrix:
-            client:
-              - 9-beta
+            client: [7-stable, 9-beta]
         runs-on: ubuntu-latest
@@ Expand Down @@