Skip to content

Commit f44dab0

Browse files
Upgrade CI (27 Aug 2025 15:56:08)
1 parent c41b99a commit f44dab0

File tree

6 files changed

+30
-66
lines changed

6 files changed

+30
-66
lines changed

.github/workflows/dco_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
run: |
9595
mkdir -p ./pr
9696
echo ${{ github.event.number }} > ./pr/NR
97-
- uses: actions/upload-artifact@v2
97+
- uses: actions/upload-artifact@v4
9898
with:
9999
name: pr
100100
path: pr/

.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: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -222,35 +222,29 @@ 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
244238
git clone $OPP_ANSIBLE_PULL_REPO -b $OPP_ANSIBLE_PULL_BRANCH operator-test-playbooks
245239
cd operator-test-playbooks
246240
ansible-playbook -i localhost, -e ansible_connection=local -e run_upstream=true -e run_prepare_catalog_repo_upstream=true -e catalog_repo=$OPP_THIS_REPO_BASE/$OPP_THIS_REPO -e catalog_repo_branch=$OPP_THIS_BRANCH upstream/local.yml --tags reset_tools,operator_info -e operator_base_dir=/tmp/community-operators-for-catalog/operators -e operators=$OPP_FORCE_OPERATORS -e cluster_type=$OPP_PRODUCTION_TYPE -e strict_cluster_version_labels=true -e production_registry_namespace=$OPP_RELEASE_BUNDLE_REGISTRY/$OPP_RELEASE_BUNDLE_ORGANIZATION $ANSIBLE_ARGS
247241
- name: Upload operator_info
248-
uses: actions/upload-artifact@v2
242+
uses: actions/upload-artifact@v4
249243
with:
250244
name: operator_info
251245
path: "/tmp/operator-test/op_info.yaml"
252246
- name: Upload converted operators
253-
uses: actions/upload-artifact@v2
247+
uses: actions/upload-artifact@v4
254248
with:
255249
name: operators_converted
256250
path: "/tmp/operator-test/operators"
@@ -268,12 +262,12 @@ jobs:
268262
runs-on: ubuntu-latest
269263
steps:
270264
- name: Download operator_info
271-
uses: actions/download-artifact@v2
265+
uses: actions/download-artifact@v4
272266
with:
273267
name: operator_info
274268
path: /tmp/operator-test/
275269
- name: Download converted operators
276-
uses: actions/download-artifact@v2
270+
uses: actions/download-artifact@v4
277271
with:
278272
name: operators_converted
279273
path: /tmp/operator-test/operators
@@ -311,12 +305,12 @@ jobs:
311305
fail-fast: false
312306
steps:
313307
- name: Download operator_info
314-
uses: actions/download-artifact@v2
308+
uses: actions/download-artifact@v4
315309
with:
316310
name: operator_info
317311
path: /tmp/operator-test/
318312
- name: Download converted operators
319-
uses: actions/download-artifact@v2
313+
uses: actions/download-artifact@v4
320314
with:
321315
name: operators_converted
322316
path: /tmp/operator-test/operators

.github/workflows/operator_release_manual.yaml

Lines changed: 12 additions & 12 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,29 +229,29 @@ 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
245245
git clone $OPP_ANSIBLE_PULL_REPO -b $OPP_ANSIBLE_PULL_BRANCH operator-test-playbooks
246246
cd operator-test-playbooks
247247
ansible-playbook -i localhost, -e ansible_connection=local -e run_upstream=true -e run_prepare_catalog_repo_upstream=true -e catalog_repo=$OPP_THIS_REPO_BASE/$OPP_THIS_REPO -e catalog_repo_branch=$OPP_THIS_BRANCH upstream/local.yml --tags reset_tools,operator_info -e operator_base_dir=/tmp/community-operators-for-catalog/operators -e operators=$OPP_FORCE_OPERATORS -e cluster_type=$OPP_PRODUCTION_TYPE -e strict_cluster_version_labels=true -e production_registry_namespace=$OPP_RELEASE_BUNDLE_REGISTRY/$OPP_RELEASE_BUNDLE_ORGANIZATION $ANSIBLE_ARGS
248248
- name: Upload operator_info
249-
uses: actions/upload-artifact@v2
249+
uses: actions/upload-artifact@v4
250250
with:
251251
name: operator_info
252252
path: "/tmp/operator-test/op_info.yaml"
253253
- name: Upload converted operators
254-
uses: actions/upload-artifact@v2
254+
uses: actions/upload-artifact@v4
255255
with:
256256
name: operators_converted
257257
path: "/tmp/operator-test/operators"
@@ -269,12 +269,12 @@ jobs:
269269
runs-on: ubuntu-latest
270270
steps:
271271
- name: Download operator_info
272-
uses: actions/download-artifact@v2
272+
uses: actions/download-artifact@v4
273273
with:
274274
name: operator_info
275275
path: /tmp/operator-test/
276276
- name: Download converted operators
277-
uses: actions/download-artifact@v2
277+
uses: actions/download-artifact@v4
278278
with:
279279
name: operators_converted
280280
path: /tmp/operator-test/operators
@@ -311,12 +311,12 @@ jobs:
311311
fail-fast: false
312312
steps:
313313
- name: Download operator_info
314-
uses: actions/download-artifact@v2
314+
uses: actions/download-artifact@v4
315315
with:
316316
name: operator_info
317317
path: /tmp/operator-test/
318318
- name: Download converted operators
319-
uses: actions/download-artifact@v2
319+
uses: actions/download-artifact@v4
320320
with:
321321
name: operators_converted
322322
path: /tmp/operator-test/operators
@@ -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

.github/workflows/operator_test.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,14 @@ jobs:
165165
allow-repeats: true
166166

167167
- name: Upload operator_info
168-
uses: actions/upload-artifact@v2
168+
uses: actions/upload-artifact@v4
169169
if: (steps.op-traffic-light.outputs.opp_op_delete == '0' || steps.op-traffic-light.outputs.opp_is_new_operatror == '1' || steps.op-traffic-light.outputs.opp_recreate == '1') && (steps.op-traffic-light.outputs.opp_ci_yaml_only == '0')
170170
with:
171171
name: operator_info
172172
path: "/tmp/operator-test/op_info.yaml"
173173
- name: Upload converted operators
174174
if: (steps.op-traffic-light.outputs.opp_op_delete == '0' || steps.op-traffic-light.outputs.opp_is_new_operatror == '1' || steps.op-traffic-light.outputs.opp_recreate == '1') && (steps.op-traffic-light.outputs.opp_ci_yaml_only == '0')
175-
uses: actions/upload-artifact@v2
175+
uses: actions/upload-artifact@v4
176176
with:
177177
name: operators_converted
178178
path: "/tmp/operator-test/operators"
@@ -207,12 +207,12 @@ jobs:
207207
with:
208208
ref: ${{ github.event.pull_request.head.sha }}
209209
- name: Download operator_info
210-
uses: actions/download-artifact@v2
210+
uses: actions/download-artifact@v4
211211
with:
212212
name: operator_info
213213
path: "/tmp/operator-test/"
214214
- name: Download converted operators
215-
uses: actions/download-artifact@v2
215+
uses: actions/download-artifact@v4
216216
with:
217217
name: operators_converted
218218
path: "/tmp/operator-test/operators"
@@ -394,7 +394,7 @@ jobs:
394394
run: |
395395
mkdir -p ./pr
396396
echo ${{ github.event.number }} > ./pr/NR
397-
- uses: actions/upload-artifact@v2
397+
- uses: actions/upload-artifact@v4
398398
with:
399399
name: pr
400400
path: pr/

0 commit comments

Comments
 (0)