Skip to content

Commit b3a427b

Browse files
Upgrade CI (03 Dec 2025 11:52:06)
1 parent 22a6b8f commit b3a427b

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.github/workflows/operator_convert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env:
2626
OPP_ANSIBLE_PULL_BRANCH: "${{ github.event.inputs.playbook_branch }}"
2727
ANSIBLE_FORCE_COLOR: 1
2828
ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
29-
ANSIBLE_STDOUT_CALLBACK: "yaml"
29+
ANSIBLE_CALLBACK_RESULT_FORMAT: "yaml"
3030
OPP_TARGET_BRANCH: "${{ github.event.inputs.target_branch }}"
3131
OPP_PRODUCTION_TYPE: "k8s"
3232

.github/workflows/operator_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ jobs:
225225
OPP_AUTO_LABEL: 1
226226
ANSIBLE_FORCE_COLOR: 1
227227
ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
228-
ANSIBLE_STDOUT_CALLBACK: "yaml"
228+
ANSIBLE_CALLBACK_RESULT_FORMAT: "yaml"
229229
TMPDIR: "/mnt/tmp"
230230
run: |
231231
sudo mkdir -p "${TMPDIR}"

.github/workflows/operator_release_manual.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ jobs:
232232
OPP_AUTO_LABEL: 1
233233
ANSIBLE_FORCE_COLOR: 1
234234
ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
235-
ANSIBLE_STDOUT_CALLBACK: "yaml"
235+
ANSIBLE_CALLBACK_RESULT_FORMAT: "yaml"
236236
TMPDIR: "/mnt/tmp"
237237
run: |
238238
sudo mkdir -p "${TMPDIR}"

.github/workflows/operator_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
OPP_AUTO_LABEL: "${{ steps.op-traffic-light.outputs.opp_auto_packagemanifest_cluster_version_label }}"
116116
ANSIBLE_FORCE_COLOR: 1
117117
ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
118-
ANSIBLE_STDOUT_CALLBACK: "yaml"
118+
ANSIBLE_CALLBACK_RESULT_FORMAT: "yaml"
119119
run: |
120120
# OPP_ANSIBLE_PULL_BRANCH="upstream-community-dev"
121121
[ "$OPP_AUTO_LABEL" = '1' ] && ANSIBLE_ARGS="-e automatic_cluster_version_label=true" || ANSIBLE_ARGS="-e automatic_cluster_version_label=false"

.github/workflows/operator_verify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ env:
4242
REGISTRY_MIRROR_PW: ${{ secrets.REGISTRY_MIRROR_PW }}
4343
ANSIBLE_FORCE_COLOR: 1
4444
ANSIBLE_DISPLAY_SKIPPED_HOSTS: 0
45-
ANSIBLE_STDOUT_CALLBACK: "yaml"
45+
ANSIBLE_CALLBACK_RESULT_FORMAT: "yaml"
4646

4747
jobs:
4848
index-verify:

ci/prow/openshift-deploy-core.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ echo "Installing ansible plugins"
279279
ansible-galaxy collection install ansible.utils
280280
set +e
281281
echo "Op_info started"
282-
ANSIBLE_STDOUT_CALLBACK=yaml ansible-playbook -i localhost, local.yml -e ansible_connection=local -e run_upstream=true -e run_prepare_catalog_repo_upstream=false -e run_remove_catalog_repo=false --tags operator_info -e operator_dir=$TARGET_PATH/$OP_NAME -e cluster_type=ocp -e strict_cluster_version_labels=true -e strict_k8s_bundles=true -e production_registry_namespace=""\
282+
ANSIBLE_CALLBACK_RESULT_FORMAT=yaml ansible-playbook -i localhost, local.yml -e ansible_connection=local -e run_upstream=true -e run_prepare_catalog_repo_upstream=false -e run_remove_catalog_repo=false --tags operator_info -e operator_dir=$TARGET_PATH/$OP_NAME -e cluster_type=ocp -e strict_cluster_version_labels=true -e strict_k8s_bundles=true -e production_registry_namespace=""\
283283
-e stream_kind=openshift_upstream -e operator_bundle_src_dir=/tmp/operators_bundle_dir -e operator_info_output_file=/tmp/op_info.yaml -e oi_failed_labels_output_file=/tmp/op_failed_labels.yaml -e oi_auto_labels_output_file=/tmp/op_auto_labels.yaml -e automatic_cluster_version_label=true
284284
ANSIBLE_STATUS=$?
285285

@@ -292,7 +292,7 @@ ANSIBLE_STATUS=$?
292292
fi
293293

294294
echo "Ansible initiated"
295-
ANSIBLE_STDOUT_CALLBACK=yaml ansible-playbook -i localhost, deploy-olm-operator-openshift-upstream.yml -e ansible_connection=local -e package_name=$OP_NAME -e operator_dir=$TARGET_PATH/$OP_NAME -e op_version=$OP_VER -e oc_bin_path="/tmp/oc-$OC_DIR_CORE/bin/oc" -e commit_tag=$QUAY_HASH -e dir_suffix_part=$OC_DIR_CORE -e current_openshift_run=$CURRENT_OPENSHIFT_RUN $SUBDIR_ARG $EXTRA_ARGS\
295+
ANSIBLE_CALLBACK_RESULT_FORMAT=yaml ansible-playbook -i localhost, deploy-olm-operator-openshift-upstream.yml -e ansible_connection=local -e package_name=$OP_NAME -e operator_dir=$TARGET_PATH/$OP_NAME -e op_version=$OP_VER -e oc_bin_path="/tmp/oc-$OC_DIR_CORE/bin/oc" -e commit_tag=$QUAY_HASH -e dir_suffix_part=$OC_DIR_CORE -e current_openshift_run=$CURRENT_OPENSHIFT_RUN $SUBDIR_ARG $EXTRA_ARGS\
296296
-e fast_op_info=true -e skip_operator_info_consistency=true -e operator_bundle_version_for_upgrade=$OP_VER -e test_registry_namespace=quay.io/operator_testing -e external_production_registry_namespace=$EXTERNAL_PROD_REG_NAMESPACE -e operator_sdk_bin_path=$SDK_BIN_PATH -e tou_olm_namespace=openshift-operator-lifecycle-manager -v
297297
ANSIBLE_STATUS=$(($ANSIBLE_STATUS+$?))
298298
echo "Reporting ..."

0 commit comments

Comments
 (0)