Adjust opp-oprt.sh to export large variables at the end of the file. Fix un-exporting mechanism.

Signed-off-by: Marek Szymutko <[email protected]>

Author: BorekZnovustvoritel

ci/scripts/opp-env.sh

@@ -77,28 +77,11 @@ echo "OPP_LABELS=$OPP_LABELS"
 # to error "Argument list too long".
 # Therefore we have to undo the exporting by
 # unsetting them before running any non-builtins
-tmp="$OPP_ADDED_MODIFIED_FILES"
-unset OPP_ADDED_MODIFIED_FILES
-OPP_ADDED_MODIFIED_FILES="$tmp"
-
-tmp="$OPP_MODIFIED_FILES"
-unset OPP_MODIFIED_FILES
-OPP_MODIFIED_FILES="$tmp"
-
-tmp="$OPP_RENAMED_FILES"
-unset OPP_RENAMED_FILES
-OPP_RENAMED_FILES="$tmp"
-
-tmp="$OPP_REMOVED_FILES"
-unset OPP_REMOVED_FILES
-OPP_REMOVED_FILES="$tmp"
-
-tmp="$OPP_LABELS"
-unset OPP_LABELS
-OPP_LABELS="$tmp"
-
-unset tmp
-# Un-exporting done
+export -n OPP_ADDED_MODIFIED_FILES
+export -n OPP_MODIFIED_FILES
+export -n OPP_RENAMED_FILES
+export -n OPP_REMOVED_FILES
+export -n OPP_LABELS
 
 echo "opp_error_code=$OPP_ERROR_CODE" >> $GITHUB_OUTPUT
 echo "opp_recreate=${OPP_RECREATE}" >> $GITHUB_OUTPUT

ci/scripts/opp-oprt.sh

@@ -64,12 +64,12 @@ echo "Repo rebased over branch OPP_OPRT_SRC_BRANCH - $OPP_OPRT_SRC_BRANCH"
 [[ $OPP_MIRROR_INDEX_MULTIARCH_IMAGE != "" ]] && OPP_EXEC_USER="$OPP_EXEC_USER -e mirror_multiarch_image=$OPP_MIRROR_INDEX_MULTIARCH_IMAGE"
 [ -n "$IIB_INPUT_REGISTRY_USER" ] && export OPP_EXEC_USER="$OPP_EXEC_USER -e registry_redhat_io_user=$IIB_INPUT_REGISTRY_USER"
 [ -n "$IIB_INPUT_REGISTRY_TOKEN" ] && export OPP_EXEC_USER_SECRETS="$OPP_EXEC_USER_SECRETS -e registry_redhat_io_token=$IIB_INPUT_REGISTRY_TOKEN"
-export OPP_ADDED_FILES=$(git diff --diff-filter=A upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
-export OPP_MODIFIED_FILES=$(git diff --diff-filter=M upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
-export OPP_REMOVED_FILES=$(git diff --diff-filter=D upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
-export OPP_RENAMED_FILES=$(git diff --diff-filter=R upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
-export OPP_ADDED_MODIFIED_FILES=$(git diff --diff-filter=AM upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
-export OPP_ADDED_MODIFIED_RENAMED_FILES=$(git diff --diff-filter=RAM upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
+OPP_ADDED_FILES=$(git diff --diff-filter=A upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
+OPP_MODIFIED_FILES=$(git diff --diff-filter=M upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
+OPP_REMOVED_FILES=$(git diff --diff-filter=D upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
+OPP_RENAMED_FILES=$(git diff --diff-filter=R upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
+OPP_ADDED_MODIFIED_FILES=$(git diff --diff-filter=AM upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
+OPP_ADDED_MODIFIED_RENAMED_FILES=$(git diff --diff-filter=RAM upstream/$OPP_OPRT_SRC_BRANCH --name-only | tr '\r\n' ' ')
 
 export OPP_CURRENT_PROJECT_REPO="$OPP_OPRT_SRC_REPO"
 export OPP_CURRENT_PROJECT_BRANCH="$OPP_OPRT_SRC_BRANCH"
@@ -111,4 +111,14 @@ if [ -n "$OPP_THIS_PR" ];then
   export OPP_APPROVED_LIST=$(cat /tmp/approved_list.json | jq -r '[.[-1] | {user: .user.login, state: .state}] | map(select(.state == "APPROVED")) | .[].user' | tr '\n' ' ')
 fi
 echo "OPP_APPROVED_LIST=$OPP_APPROVED_LIST"
-bash <(curl -sL $OPP_SCRIPT_ENV_URL)
+
+OPP_SCRIPT_FILE_CONTENTS=$(curl -sL "$OPP_SCRIPT_ENV_URL")
+
+# Variables expected to have many values are exported near the end
+export OPP_ADDED_FILES
+export OPP_MODIFIED_FILES
+export OPP_REMOVED_FILES
+export OPP_RENAMED_FILES
+export OPP_ADDED_MODIFIED_FILES
+export OPP_ADDED_MODIFIED_RENAMED_FILES
+bash <(echo "$OPP_SCRIPT_FILE_CONTENTS")