From e91830401e983ef02d85790e1d850a659b1134a7 Mon Sep 17 00:00:00 2001
From: Daniele Palaia <dpalaia@vmware.com>
Date: Thu, 7 Mar 2024 12:41:20 +0100
Subject: [PATCH] using checkout instead of git clone

---
 .../testing_and_publishing_OLM_bundle.yml     | 46 ++++++++++++++-----
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/testing_and_publishing_OLM_bundle.yml b/.github/workflows/testing_and_publishing_OLM_bundle.yml
index 28d26759..ca78a8e1 100644
--- a/.github/workflows/testing_and_publishing_OLM_bundle.yml
+++ b/.github/workflows/testing_and_publishing_OLM_bundle.yml
@@ -3,8 +3,10 @@
 name: test-and-publish-OLM-bundle
 
 on:
-  release:
-    types: [published]
+  push:
+    # Pattern matched against refs/tags
+    branches:
+      - "testing_olm"
     
   workflow_dispatch:
 
@@ -31,6 +33,11 @@ jobs:
         - name: Checkout
           uses: actions/checkout@v4
 
+        - name: Checkout OLM-Package-Repo
+          uses: actions/checkout@v4
+          with:
+            repository: rabbitmq/OLM-Package-Repo
+            path: ./OLM-Package-Repo
 
         - name: Set tag image for tagged version
           if: startsWith(github.ref, 'refs/tags/v')
@@ -53,8 +60,6 @@ jobs:
           run: |   
             sed '/mount_program =/s/^#//' -i /etc/containers/storage.conf
             podman login quay.io -u $username -p $password
-            git config --global --add safe.directory /__w/messaging-topology-operator/messaging-topology-operator
-            git clone https://github.com/rabbitmq/OLM-Package-Repo
             make generate-manifests
             cp ./releases/messaging-topology-operator-with-certmanager.yaml ./OLM-Package-Repo/generate_OLM/generate_OLM_messaging_topology_operator/manifests_crds/
             cp ./config/crd/bases/*.yaml ./OLM-Package-Repo/generate_OLM/generate_OLM_messaging_topology_operator/manifests_crds/crds
@@ -87,11 +92,19 @@ jobs:
         - name: Checkout
           uses: actions/checkout@v4
 
-        - name: Get Openshift connection info kubeconf from infrastructure repo - test
-          env:
-            GITHUB_ACCESS_TOKEN: ${{ secrets.GIT_HUB_ACCESS_INFRA_REPO_TOKEN }}
-          run: |
-            git clone https://oauth2:"$GITHUB_ACCESS_TOKEN"@github.com/rabbitmq/infrastructure
+        - name: Checkout infrastructure repo
+          uses: actions/checkout@v4
+          with:
+            repository: rabbitmq/infrastructure
+            token: ${{ secrets.GIT_HUB_ACCESS_INFRA_REPO_TOKEN }}
+            path: ./infrastructure
+
+        - name: Checkout OLM-Package-Repo
+          uses: actions/checkout@v4
+          with:
+            repository: rabbitmq/OLM-Package-Repo
+            path: ./OLM-Package-Repo
+
         - name: Protect access to the cluster with a mutex
           uses: ben-z/gh-action-mutex@v1.0-alpha-8
           with:
@@ -104,7 +117,6 @@ jobs:
             TOKEN: ${{ secrets.OPERATORHUB_TOKEN }}
             BUNDLE_VERSION: ${{ env.BUNDLE_VERSION }}
           run: |   
-            git clone https://github.com/rabbitmq/OLM-Package-Repo
             mkdir $HOME/.kube
             cp ./infrastructure/k8s/okd/admin-kubeconfig.yaml $HOME/.kube/config
             export KUBECONFIG=$HOME/.kube/config
@@ -133,6 +145,18 @@ jobs:
         steps:
         - name: Checkout
           uses: actions/checkout@v4
+        - name: Checkout community-operators repo
+          uses: actions/checkout@v4
+          with:
+            repository: rabbitmq/community-operators
+            path: ./community-operators
+            token: ${{ secrets.OPERATORHUB_TOKEN }}
+        - name: Checkout community-operators-prod repo
+          uses: actions/checkout@v4
+          with:
+            repository: rabbitmq/community-operators-prod
+            path: ./community-operators-prod
+            token: ${{ secrets.OPERATORHUB_TOKEN }}
         - name: Set tag image for tagged version
           if: startsWith(github.ref, 'refs/tags/v')
           run: | 
@@ -153,7 +177,6 @@ jobs:
           run: |
             git config --global user.name "DanielePalaia"
             git config --global user.email "dpalaia@vmware.com"
-            git clone https://github.com/rabbitmq/community-operators
             cd community-operators/operators/rabbitmq-messaging-topology-operator/
             git branch rabbitmq-messaging-topology-operator-$BUNDLE_VERSION
             git checkout rabbitmq-messaging-topology-operator-$BUNDLE_VERSION
@@ -170,7 +193,6 @@ jobs:
             TOKEN: ${{ secrets.OPERATORHUB_TOKEN }}
             BUNDLE_VERSION: ${{ env.BUNDLE_VERSION }}
           run: |
-            git clone https://github.com/rabbitmq/community-operators-prod
             cd community-operators-prod/operators/rabbitmq-messaging-topology-operator/
             git branch rabbitmq-messaging-topology-operator-$BUNDLE_VERSION
             git checkout rabbitmq-messaging-topology-operator-$BUNDLE_VERSION