Remove container logic from Github Actions workflow

Since container building and pushing is now handled by RHTAP, remove steps from Github Actions and exclusively run unit tests. Signed-off-by: Antonio Torres <[email protected]>
freeipa · Feb 7, 2024 · 9ad0f2b · 9ad0f2b
1 parent 6c6cd21
commit 9ad0f2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 101 deletions.
diff --git a/.github/workflows/gating.yaml b/.github/workflows/gating.yaml
@@ -18,122 +18,29 @@ jobs:
       - uses: pre-commit/[email protected]
 
   build-container:
-    name: Build and push the ipa-tuura container
+    name: Build and test the ipa-tuura container
     runs-on: ubuntu-latest
     if: github.repository_owner == 'freeipa'
     needs: [pre-commit]
-    env:
-      IMAGE_REGISTRY_GITHUB: ghcr.io
-      IMAGE_REGISTRY_QUAY: quay.io/idmops/ipa-tuura
-      IMAGE_TAG: ${{ github.event.number || github.ref_name  }}  # use PR number else ref_name -> branch name
-
     steps:
-      - name: Set the ghcr.io image name derived from repository name
-        run: |
-          echo "IMAGE_REGISTRY_GITHUB=${IMAGE_REGISTRY_GITHUB}/${IMAGE,,}" >> ${GITHUB_ENV}
-        env:
-          IMAGE: '${{ github.repository }}'
-
-      - name: Log in to the GitHub Container registry
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: ${{ env.IMAGE_REGISTRY_GITHUB }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Log in to Quay.io
-        if: github.event_name != 'pull_request'
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: ${{ env.IMAGE_REGISTRY_QUAY }}
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
       - uses: actions/checkout@v3
-
       - name: build image
         id: build-image
         run: |
           sudo -E su
-          podman build -t ${{ env.IMAGE_REGISTRY_GITHUB }}:${{ env.IMAGE_TAG }} -f Containerfile.test .
-
-      - name: Print image
-        run: |
-          sudo -E su
-          podman images
-
-      - name: Push to Repositories if PR is not from fork
-        id: push-to-repo
-        uses: redhat-actions/push-to-registry@v2
-        if: |
-          github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
-        with:
-          image: ${{ env.IMAGE_REGISTRY_GITHUB }}
-          tags: ${{ env.IMAGE_TAG }}
-          registry: ${{ env.IMAGE_REGISTRY_QUAY }}
-
-      - name: Print image url if PR is not from fork
-        if: |
-          github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
-        run: echo "Image pushed to ${{ steps.push-to-repo.outputs.registry-paths }}"
-
+          podman build -t ipatuura -f Containerfile.test .
       - name: Deploy the service
         run: |
           sudo -E su
           podman run -d --privileged \
                  -p 8000:8000 -p 3501:3500 -p 4701:81 -p 4430:443 \
                  --hostname bridge.ipa.test \
                  --name bridge \
-                 ${{ env.IMAGE_REGISTRY_GITHUB }}:${{ env.IMAGE_TAG }}
-
+                 ipatuura
       - name: Run the unit tests
         run: |
           sudo -E su
-          podman exec -it bridge sh -c "coverage run manage.py test domains -v 2 &&
+          podman exec -it bridge sh -c "pip install coverage factory_boy &&
+          coverage run manage.py test domains -v 2 &&
           coverage report &&
           coverage html"
-
-  pull-container:
-    name: Pull the ipa-tuura container if PR is not from fork
-    runs-on: ubuntu-latest
-    if: |
-      github.repository_owner == 'freeipa' &&
-      github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name
-    needs: [build-container]
-    env:
-      IMAGE_REGISTRY_GITHUB: ghcr.io
-      IMAGE_REGISTRY_QUAY: quay.io/idmops/ipa-tuura
-      IMAGE_TAG: ${{ github.event.number || github.ref_name  }}  # use PR number else ref_name -> branch name
-
-    steps:
-      - name: Set the ghcr.io image name derived from repository name (PR from repo)
-        run: |
-          echo "IMAGE_REGISTRY_GITHUB=${IMAGE_REGISTRY_GITHUB}/${IMAGE,,}" >> ${GITHUB_ENV}
-        env:
-          IMAGE: '${{ github.repository }}'
-
-      - name: Log in to the GitHub Container registry
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: ${{ env.IMAGE_REGISTRY_GITHUB }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Log in to Quay.io
-        if: github.event_name != 'pull_request'
-        uses: redhat-actions/podman-login@v1
-        with:
-          registry: ${{ env.IMAGE_REGISTRY_QUAY }}
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
-      - name: Pull the image previously built from GitHub Container registry
-        run: |
-          podman pull ${{ env.IMAGE_REGISTRY_GITHUB }}:${{ env.IMAGE_TAG }}
-          podman images
-
-      - name: Pull the image previously built from Quay.io
-        if: github.event_name != 'pull_request'
-        run: |
-          podman pull ${{ env.IMAGE_REGISTRY_QUAY }}:${{ env.IMAGE_TAG }}
-          podman images
diff --git a/Containerfile.test b/Containerfile.test
@@ -54,9 +54,6 @@ COPY . /www/ipa-tuura
 # Install project dependencies
 RUN pip install -r /www/ipa-tuura/src/install/requirements.txt
 
-# Install Unit Test Dependencies
-RUN pip install factory_boy coverage
-
 # Packaging up Django model changes
 WORKDIR /www/ipa-tuura/src/ipa-tuura/
 RUN python3 manage.py makemigrations