From 16f8f3a13e7475ce62f3739b793b7b1d6bdb7e2c Mon Sep 17 00:00:00 2001
From: framework-automation
 <41898282+framework-automation[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 13:21:54 +0000
Subject: [PATCH] Upgrade CI (31 Jul 2024 13:21:54)

---
 .github/workflows/debug.yaml                  | 30 -------------------
 .github/workflows/operator_convert.yaml       |  2 +-
 .github/workflows/operator_release.yaml       | 14 ++-------
 .../workflows/operator_release_manual.yaml    | 10 +++----
 4 files changed, 8 insertions(+), 48 deletions(-)
 delete mode 100644 .github/workflows/debug.yaml

diff --git a/.github/workflows/debug.yaml b/.github/workflows/debug.yaml
deleted file mode 100644
index 4d797370f..000000000
--- a/.github/workflows/debug.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-name: Debug
-on:
-  workflow_dispatch:
-    inputs:
-      os:
-        required: true
-        type: choice
-        options:
-        - ubuntu-latest
-        - ubuntu-22.04
-        - ubuntu-20.04
-
-jobs:
-  debug:
-    runs-on: "${{ github.event.inputs.os }}"
-    #container: quay.io/operator_testing/operator-test-playbooks:latest
-    steps:
-    - name: Run debug tests
-      run: |
-        set -x
-        id
-        uname -a
-        cat /etc/os-release
-        cat /etc/subuid
-        cat /etc/subgid
-        docker version
-        docker run -it --rm quay.io/quay/busybox date
-        sleep 5
-        echo done
diff --git a/.github/workflows/operator_convert.yaml b/.github/workflows/operator_convert.yaml
index 06ae6595c..e962d1d47 100644
--- a/.github/workflows/operator_convert.yaml
+++ b/.github/workflows/operator_convert.yaml
@@ -78,7 +78,7 @@ jobs:
             ANSIBLE_TAGS="operator_info"
             cd $PROJECT_DIR
             echo "Moving bundle for '$op' ..."
-            mv $PROJECT_DIR/operators/$op/ci.yaml /tmp/operator-test/operators/$op/
+            [ -e $PROJECT_DIR/operators/$op/ci.yaml ] && mv $PROJECT_DIR/operators/$op/ci.yaml /tmp/operator-test/operators/$op/ || echo "ci.yaml file does not exist, skipping ..." 
             rm -rf $PROJECT_DIR/operators/$op
             mv /tmp/operator-test/operators/$op $PROJECT_DIR/operators/$op
             find $PROJECT_DIR/operators/$op -name 'bundle.Dockerfile' -delete
diff --git a/.github/workflows/operator_release.yaml b/.github/workflows/operator_release.yaml
index a70531949..7211c74db 100644
--- a/.github/workflows/operator_release.yaml
+++ b/.github/workflows/operator_release.yaml
@@ -50,6 +50,7 @@ env:
   INDEX_PATH_TO_SIGN: "not-defined"
   SIGNATURE_ENDPOINT: "https://not-defined"
   OPP_REVIEWERS_ENABLED: 0
+  TMPDIR: "/mnt"
 
 
   OPP_ALLOW_FORCE_RELEASE: ${{ github.event.inputs.release }}
@@ -222,22 +223,13 @@ jobs:
           OPP_OP_INFO_PARALLEL: 1
           OPP_OP_INFO_PARALLEL_BATCH: 20
 
-          THIS_OPERATOR: ${{ needs.pr-check.outputs.opp_name }}
           OPP_AUTO_LABEL: 1
           ANSIBLE_FORCE_COLOR: 1
           ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
           ANSIBLE_STDOUT_CALLBACK: "yaml"
         run: |
-
-          echo "Operators out of sync: ${OPP_FORCE_OPERATORS}"
-          OTHER_OPERATORS=$(echo ${OPP_FORCE_OPERATORS} | tr ' ' '\n' | grep -v "^${THIS_OPERATOR}$" | shuf | head -2 | xargs echo | tr ' ' ',')
-          if [ -n "${OTHER_OPERATORS}" ] ; then
-            OPP_FORCE_OPERATORS="${THIS_OPERATOR},${OTHER_OPERATORS}"
-          else
-            OPP_FORCE_OPERATORS="${THIS_OPERATOR}"
-          fi
-
-          echo "Syncing: ${OPP_FORCE_OPERATORS}"
+          OPP_FORCE_OPERATORS=${OPP_FORCE_OPERATORS// /,}
+          echo $OPP_FORCE_OPERATORS
           [ "$OPP_AUTO_LABEL" = '1' ] && ANSIBLE_ARGS="-e automatic_cluster_version_label=true" || ANSIBLE_ARGS="-e automatic_cluster_version_label=false"
           [ "$OPP_OP_INFO_PARALLEL" = '1' ] && ANSIBLE_ARGS="$ANSIBLE_ARGS -e op_info_parallel=true -e op_info_parallel_batch=$OPP_OP_INFO_PARALLEL_BATCH" || ANSIBLE_ARGS="$ANSIBLE_ARGS -e op_info_parallel=false"
           echo $ANSIBLE_ARGS
diff --git a/.github/workflows/operator_release_manual.yaml b/.github/workflows/operator_release_manual.yaml
index 6a26bd0b5..a59c3c95a 100644
--- a/.github/workflows/operator_release_manual.yaml
+++ b/.github/workflows/operator_release_manual.yaml
@@ -63,6 +63,7 @@ env:
   INDEX_PATH_TO_SIGN: "not-defined"
   SIGNATURE_ENDPOINT: "https://not-defined"
   OPP_REVIEWERS_ENABLED: 0
+  TMPDIR: "/mnt"
 
 
   OPP_ALLOW_FORCE_RELEASE: ${{ github.event.inputs.release }}
@@ -210,7 +211,7 @@ jobs:
  
           for index in $(echo '${{ github.event.inputs.index }}' | jq -r .[]); do
               TARGET_INDEX_RAW=$(echo $index|cut -d '-' -f1)
-              TARGET_INDEX_UNDERLINE=$(echo $TARGET_INDEX_RAW|tr '.' '_') 
+              TARGET_INDEX_UNDERLINE=$(echo $TARGET_INDEX_RAW|tr '.' '_')
               export OPP_FORCE_OPERATORS_$TARGET_INDEX_UNDERLINE="${{ github.event.inputs.list_of_operators }}"
               echo "opp_uncomplete_operators_$TARGET_INDEX_UNDERLINE=${{ github.event.inputs.list_of_operators }}" >> $GITHUB_OUTPUT
           done
@@ -229,16 +230,13 @@ jobs:
           OPP_OP_INFO_PARALLEL: 1
           OPP_OP_INFO_PARALLEL_BATCH: 20
 
-          THIS_OPERATOR: ${{ needs.pr-check.outputs.opp_name }}
           OPP_AUTO_LABEL: 1
           ANSIBLE_FORCE_COLOR: 1
           ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
           ANSIBLE_STDOUT_CALLBACK: "yaml"
         run: |
-
           OPP_FORCE_OPERATORS=${OPP_FORCE_OPERATORS// /,}
-
-          echo "Syncing: ${OPP_FORCE_OPERATORS}"
+          echo $OPP_FORCE_OPERATORS
           [ "$OPP_AUTO_LABEL" = '1' ] && ANSIBLE_ARGS="-e automatic_cluster_version_label=true" || ANSIBLE_ARGS="-e automatic_cluster_version_label=false"
           [ "$OPP_OP_INFO_PARALLEL" = '1' ] && ANSIBLE_ARGS="$ANSIBLE_ARGS -e op_info_parallel=true -e op_info_parallel_batch=$OPP_OP_INFO_PARALLEL_BATCH" || ANSIBLE_ARGS="$ANSIBLE_ARGS -e op_info_parallel=false"
           echo $ANSIBLE_ARGS
@@ -347,7 +345,7 @@ jobs:
 
           for index in $(echo '${{ github.event.inputs.index }}' | jq -r .[]); do
               TARGET_INDEX_RAW=$(echo $index|cut -d '-' -f1)
-              TARGET_INDEX_UNDERLINE=$(echo $TARGET_INDEX_RAW|tr '.' '_') 
+              TARGET_INDEX_UNDERLINE=$(echo $TARGET_INDEX_RAW|tr '.' '_')
               export OPP_FORCE_OPERATORS_$TARGET_INDEX_UNDERLINE="${{ github.event.inputs.list_of_operators }}"
           done