Skip to content

Commit 6d247eb

Browse files
Upgrade CI (07 Aug 2024 16:33:33)
1 parent f192daf commit 6d247eb

File tree

4 files changed

+12
-48
lines changed

4 files changed

+12
-48
lines changed

.github/workflows/debug.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

.github/workflows/operator_convert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
ANSIBLE_TAGS="operator_info"
7979
cd $PROJECT_DIR
8080
echo "Moving bundle for '$op' ..."
81-
mv $PROJECT_DIR/operators/$op/ci.yaml /tmp/operator-test/operators/$op/
81+
[ -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 ..."
8282
rm -rf $PROJECT_DIR/operators/$op
8383
mv /tmp/operator-test/operators/$op $PROJECT_DIR/operators/$op
8484
find $PROJECT_DIR/operators/$op -name 'bundle.Dockerfile' -delete

.github/workflows/operator_release.yaml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -222,22 +222,16 @@ jobs:
222222
OPP_OP_INFO_PARALLEL: 1
223223
OPP_OP_INFO_PARALLEL_BATCH: 20
224224

225-
THIS_OPERATOR: ${{ needs.pr-check.outputs.opp_name }}
226225
OPP_AUTO_LABEL: 1
227226
ANSIBLE_FORCE_COLOR: 1
228227
ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
229228
ANSIBLE_STDOUT_CALLBACK: "yaml"
229+
TMPDIR: "/mnt/tmp"
230230
run: |
231-
232-
echo "Operators out of sync: ${OPP_FORCE_OPERATORS}"
233-
OTHER_OPERATORS=$(echo ${OPP_FORCE_OPERATORS} | tr ' ' '\n' | grep -v "^${THIS_OPERATOR}$" | shuf | head -2 | xargs echo | tr ' ' ',')
234-
if [ -n "${OTHER_OPERATORS}" ] ; then
235-
OPP_FORCE_OPERATORS="${THIS_OPERATOR},${OTHER_OPERATORS}"
236-
else
237-
OPP_FORCE_OPERATORS="${THIS_OPERATOR}"
238-
fi
239-
240-
echo "Syncing: ${OPP_FORCE_OPERATORS}"
231+
sudo mkdir -p "${TMPDIR}"
232+
sudo chmod 1777 "${TMPDIR}"
233+
OPP_FORCE_OPERATORS=${OPP_FORCE_OPERATORS// /,}
234+
echo $OPP_FORCE_OPERATORS
241235
[ "$OPP_AUTO_LABEL" = '1' ] && ANSIBLE_ARGS="-e automatic_cluster_version_label=true" || ANSIBLE_ARGS="-e automatic_cluster_version_label=false"
242236
[ "$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"
243237
echo $ANSIBLE_ARGS

.github/workflows/operator_release_manual.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ jobs:
210210
211211
for index in $(echo '${{ github.event.inputs.index }}' | jq -r .[]); do
212212
TARGET_INDEX_RAW=$(echo $index|cut -d '-' -f1)
213-
TARGET_INDEX_UNDERLINE=$(echo $TARGET_INDEX_RAW|tr '.' '_')
213+
TARGET_INDEX_UNDERLINE=$(echo $TARGET_INDEX_RAW|tr '.' '_')
214214
export OPP_FORCE_OPERATORS_$TARGET_INDEX_UNDERLINE="${{ github.event.inputs.list_of_operators }}"
215215
echo "opp_uncomplete_operators_$TARGET_INDEX_UNDERLINE=${{ github.event.inputs.list_of_operators }}" >> $GITHUB_OUTPUT
216216
done
@@ -229,16 +229,16 @@ jobs:
229229
OPP_OP_INFO_PARALLEL: 1
230230
OPP_OP_INFO_PARALLEL_BATCH: 20
231231

232-
THIS_OPERATOR: ${{ needs.pr-check.outputs.opp_name }}
233232
OPP_AUTO_LABEL: 1
234233
ANSIBLE_FORCE_COLOR: 1
235234
ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
236235
ANSIBLE_STDOUT_CALLBACK: "yaml"
236+
TMPDIR: "/mnt/tmp"
237237
run: |
238-
238+
sudo mkdir -p "${TMPDIR}"
239+
sudo chmod 1777 "${TMPDIR}"
239240
OPP_FORCE_OPERATORS=${OPP_FORCE_OPERATORS// /,}
240-
241-
echo "Syncing: ${OPP_FORCE_OPERATORS}"
241+
echo $OPP_FORCE_OPERATORS
242242
[ "$OPP_AUTO_LABEL" = '1' ] && ANSIBLE_ARGS="-e automatic_cluster_version_label=true" || ANSIBLE_ARGS="-e automatic_cluster_version_label=false"
243243
[ "$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"
244244
echo $ANSIBLE_ARGS
@@ -347,7 +347,7 @@ jobs:
347347
348348
for index in $(echo '${{ github.event.inputs.index }}' | jq -r .[]); do
349349
TARGET_INDEX_RAW=$(echo $index|cut -d '-' -f1)
350-
TARGET_INDEX_UNDERLINE=$(echo $TARGET_INDEX_RAW|tr '.' '_')
350+
TARGET_INDEX_UNDERLINE=$(echo $TARGET_INDEX_RAW|tr '.' '_')
351351
export OPP_FORCE_OPERATORS_$TARGET_INDEX_UNDERLINE="${{ github.event.inputs.list_of_operators }}"
352352
done
353353

0 commit comments

Comments
 (0)