From 106d5606e460e8d11331d79061136538b087d30c Mon Sep 17 00:00:00 2001
From: Shir Moran <shmoran@redhat.com>
Date: Mon, 30 Oct 2023 12:57:19 +0200
Subject: [PATCH 1/2] enable run of collector's sanity check in CI

---
 .github/workflows/pre-main.yaml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/pre-main.yaml b/.github/workflows/pre-main.yaml
index ca4a99dd2..099b58c89 100644
--- a/.github/workflows/pre-main.yaml
+++ b/.github/workflows/pre-main.yaml
@@ -355,6 +355,19 @@ jobs:
         env:
           IMAGE_TAG: ${TNF_IMAGE_TAG}
 
+      # Prepare collector to be used when running smoke tests
+      - name: Check out `Collector`
+        uses: actions/checkout@v4
+        with:
+          repository: shirmoran/collector
+          ref: clean-makefile
+          path: collector
+
+      - name: Deploy collector and mysql
+        uses: ./collector/.github/actions/prepare-collector-for-use
+        with:
+          working_directory: collector
+
       # Clean up unused container image layers. We need to filter out a possible error return code
       # from docker with "|| true" as some images might still be used by running kind containers and
       # won't be removed.
@@ -377,22 +390,18 @@ jobs:
         run: TNF_LOG_LEVEL=${TNF_SMOKE_TESTS_LOG_LEVEL} TNF_ENABLE_DATA_COLLECTION=true ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }} -l "${SMOKE_TESTS_GINKGO_LABELS_FILTER}"
 
       # Prepare collector to be used when running smoke tests
-      - name: Check out `Collector`
-        uses: actions/checkout@v4
-        with:
-          repository: test-network-function/collector
-          path: collector
+      # - name: Check out `Collector`
+      #   uses: actions/checkout@v4
+      #   with:
+      #     repository: shirmoran/collector
+      #     ref: clean-makefile
+      #     path: collector
 
-      - name: Deploy collector and mysql
-        uses: ./collector/.github/actions/prepare-collector-for-use
+      - name: Run sanity check on collector
+        uses: ./collector/.github/actions/run-sanity-check
         with:
           working_directory: collector
 
-      # - name: Run sanity check on collector
-      #   uses: ./collector/.github/actions/run-sanity-check
-      #   with:
-      #     working_directory: collector
-
       - name: Upload container test results as an artifact
         uses: actions/upload-artifact@v3
         if: always()

From 32a511b5168d2d28a69c16c30f0f26146b7e9a7e Mon Sep 17 00:00:00 2001
From: Shir Moran <shmoran@redhat.com>
Date: Tue, 31 Oct 2023 10:41:38 +0200
Subject: [PATCH 2/2] use upstream collector repo for checkout action

---
 .github/workflows/pre-main.yaml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/pre-main.yaml b/.github/workflows/pre-main.yaml
index 099b58c89..e12a9b943 100644
--- a/.github/workflows/pre-main.yaml
+++ b/.github/workflows/pre-main.yaml
@@ -359,8 +359,7 @@ jobs:
       - name: Check out `Collector`
         uses: actions/checkout@v4
         with:
-          repository: shirmoran/collector
-          ref: clean-makefile
+          repository: test-network-function/collector
           path: collector
 
       - name: Deploy collector and mysql
@@ -389,14 +388,6 @@ jobs:
       - name: 'Test: Run Smoke Tests in a TNF container'
         run: TNF_LOG_LEVEL=${TNF_SMOKE_TESTS_LOG_LEVEL} TNF_ENABLE_DATA_COLLECTION=true ./run-tnf-container.sh ${{ env.TESTING_CMD_PARAMS }} -l "${SMOKE_TESTS_GINKGO_LABELS_FILTER}"
 
-      # Prepare collector to be used when running smoke tests
-      # - name: Check out `Collector`
-      #   uses: actions/checkout@v4
-      #   with:
-      #     repository: shirmoran/collector
-      #     ref: clean-makefile
-      #     path: collector
-
       - name: Run sanity check on collector
         uses: ./collector/.github/actions/run-sanity-check
         with: