Fix REGISTRY_NAMESPACE param

The CI has been updated to install packages from the specified REGISTRY_NAMESPACE.
dogtagpki · Feb 19, 2024 · 2ac7624 · 2ac7624
1 parent da2508e
commit 2ac7624
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 11 deletions.
diff --git a/.github/workflows/external-application-connection-tests.yml b/.github/workflows/external-application-connection-tests.yml
@@ -2,6 +2,9 @@ name: Third party Tests
 
 on: [push, pull_request]
 
+env:
+  NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || github.repository_owner }}
+
 jobs:
   build:
     name: Waiting for build
@@ -65,13 +68,13 @@ jobs:
 
       - name: Import LDAP SDK packages
         run: |
-          docker create --name=ldapjdk-dist quay.io/dogtagpki/ldapjdk-dist:latest
+          docker create --name=ldapjdk-dist quay.io/$NAMESPACE/ldapjdk-dist:latest
           docker cp ldapjdk-dist:/root/RPMS/. /tmp/RPMS/
           docker rm -f ldapjdk-dist
 
       - name: Import PKI packages
         run: |
-          docker create --name=pki-dist quay.io/dogtagpki/pki-dist:latest
+          docker create --name=pki-dist quay.io/$NAMESPACE/pki-dist:latest
           docker cp pki-dist:/root/RPMS/. /tmp/RPMS/
           docker rm -f pki-dist
 

diff --git a/.github/workflows/pki-build-test.yml b/.github/workflows/pki-build-test.yml
@@ -2,6 +2,9 @@ name: Testing PKI build
 
 on: workflow_call
 
+env:
+  NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || github.repository_owner }}
+
 jobs:
   test:
     name: Test
@@ -29,14 +32,14 @@ jobs:
 
       - name: Import LDAP SDK packages
         run: |
-          docker create --name=ldapjdk-dist quay.io/dogtagpki/ldapjdk-dist:latest
+          docker create --name=ldapjdk-dist quay.io/$NAMESPACE/ldapjdk-dist:latest
           docker cp ldapjdk-dist:/root/RPMS/. /tmp/RPMS/
           docker rm -f ldapjdk-dist
 
       - name: Install build dependencies
         run: |
           docker exec pki dnf install -y git rpm-build
-          docker exec pki git clone -b master https://github.com/dogtagpki/pki
+          docker exec pki git clone -b master https://github.com/$NAMESPACE/pki
           docker exec pki dnf builddep -y --skip-unavailable --spec pki/pki.spec
           docker cp /tmp/RPMS/. pki:/root/RPMS/
           docker exec pki bash -c "dnf localinstall -y /root/RPMS/*"

diff --git a/.github/workflows/pki-ca-test.yml b/.github/workflows/pki-ca-test.yml
@@ -2,6 +2,9 @@ name: Testing PKI CA
 
 on: workflow_call
 
+env:
+  NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || github.repository_owner }}
+
 jobs:
   test:
     name: Test
@@ -29,13 +32,13 @@ jobs:
 
       - name: Import LDAP SDK packages
         run: |
-          docker create --name=ldapjdk-dist quay.io/dogtagpki/ldapjdk-dist:latest
+          docker create --name=ldapjdk-dist quay.io/$NAMESPACE/ldapjdk-dist:latest
           docker cp ldapjdk-dist:/root/RPMS/. /tmp/RPMS/
           docker rm -f ldapjdk-dist
 
       - name: Import PKI packages
         run: |
-          docker create --name=pki-dist quay.io/dogtagpki/pki-dist:latest
+          docker create --name=pki-dist quay.io/$NAMESPACE/pki-dist:latest
           docker cp pki-dist:/root/RPMS/. /tmp/RPMS/
           docker rm -f pki-dist
 

diff --git a/.github/workflows/pki-tools-test.yml b/.github/workflows/pki-tools-test.yml
@@ -2,6 +2,9 @@ name: Testing PKI tools
 
 on: workflow_call
 
+env:
+  NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || github.repository_owner }}
+
 jobs:
   test:
     name: Test
@@ -29,13 +32,13 @@ jobs:
 
       - name: Import LDAP SDK packages
         run: |
-          docker create --name=ldapjdk-dist quay.io/dogtagpki/ldapjdk-dist:latest
+          docker create --name=ldapjdk-dist quay.io/$NAMESPACE/ldapjdk-dist:latest
           docker cp ldapjdk-dist:/root/RPMS/. /tmp/RPMS/
           docker rm -f ldapjdk-dist
 
       - name: Import PKI packages
         run: |
-          docker create --name=pki-dist quay.io/dogtagpki/pki-dist:latest
+          docker create --name=pki-dist quay.io/$NAMESPACE/pki-dist:latest
           docker cp pki-dist:/root/RPMS/. /tmp/RPMS/
           docker rm -f pki-dist
 

diff --git a/.github/workflows/pki-tps-test.yml b/.github/workflows/pki-tps-test.yml
@@ -2,6 +2,9 @@ name: Testing TPS
 
 on: workflow_call
 
+env:
+  NAMESPACE: ${{ vars.REGISTRY_NAMESPACE || github.repository_owner }}
+
 jobs:
   test:
     name: Test
@@ -29,13 +32,13 @@ jobs:
 
       - name: Import LDAP SDK packages
         run: |
-          docker create --name=ldapjdk-dist quay.io/dogtagpki/ldapjdk-dist:latest
+          docker create --name=ldapjdk-dist quay.io/$NAMESPACE/ldapjdk-dist:latest
           docker cp ldapjdk-dist:/root/RPMS/. /tmp/RPMS/
           docker rm -f ldapjdk-dist
 
       - name: Import PKI packages
         run: |
-          docker create --name=pki-dist quay.io/dogtagpki/pki-dist:latest
+          docker create --name=pki-dist quay.io/$NAMESPACE/pki-dist:latest
           docker cp pki-dist:/root/RPMS/. /tmp/RPMS/
           docker rm -f pki-dist
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -53,7 +53,8 @@ jobs:
 
   - script: |
       docker exec runner dnf install -y dnf-plugins-core rpm-build
-      docker exec runner dnf copr enable -y @pki/master
+      if [ -n "$COPR_REPO" ]; then docker exec runner dnf copr enable -y $COPR_REPO; fi
+
       docker cp . runner:/root/src
       docker exec -w /root/src runner dnf builddep -y --spec jss.spec
     displayName: Install build dependencies