From 8464b9e6bad24177a60a0e9bcc507bd750b0ef52 Mon Sep 17 00:00:00 2001
From: Marco Braga <mrbraga@redhat.com>
Date: Mon, 1 Jul 2024 22:12:58 -0300
Subject: [PATCH] fix/ci: login to quay.io

---
 .github/workflows/ci.yaml | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 249890bd..d9ffe2ce 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -6,6 +6,10 @@ on:
     tags:
       - 'v*.*.*'
 
+env:
+  REGISTRY_USER: opct+github_opct_plugins
+  REGISTRY_ADDR: quay.io
+
 jobs:
   linters:
     runs-on: ubuntu-latest
@@ -33,7 +37,7 @@ jobs:
   build-container:
     name: release container(devel)
     if: ${{ github.event_name == 'pull_request' &&  github.base_ref == 'main' }}
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs: [linters]
     env:
       VERSION: "v0.0.0-devel-pr.${{ github.event.pull_request.number }}"
@@ -41,24 +45,34 @@ jobs:
       PLUGIN_TESTS_REPO: localhost/plugin-openshift-tests
       MGM_REPO: localhost/must-gather-monitoring
 
-    environment: production
+    #environment: production
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      # # https://github.com/marketplace/actions/podman-login
       - name: Log in to Quay.io
         uses: redhat-actions/podman-login@v1
         with:
-          username: ${{ env.PROD_QUAY_USER }}
-          password: ${{ env.PROD_QUAY_PASS }}
-          registry: quay.io
+          username: ${{ env.REGISTRY_USER }}
+          password: ${{ secrets.REGISTRY_PASS }}
+          registry: ${{ env.REGISTRY_ADDR }}
+
+      # # https://github.com/marketplace/actions/podman-login
+      # - name: Log in to Quay.io
+      #   uses: redhat-actions/podman-login@v1
+      #   with:
+      #     username: ${{ env.PROD_QUAY_USER }}
+      #     password: ${{ env.PROD_QUAY_PASS }}
+      #     registry: quay.io
 
       - name: Build and publish container images
         shell: bash
         run: |
+          #echo "> Logging to Quay.io and user [${{ env.OPCT_USER }}]:"
+          ##podman login -u="${{ env.OPCT_USER }}" -p="${{ env.OPCT_PASS }}" quay.io
+
           echo "> Build and publish container image:"
           bash ./hack/build-all.sh