Skip to content

MPIIT: Add support for skipJobTriggers switch for triggered job lists #77544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oharan2 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

MPIIT: Add support for skipJobTriggers switch for triggered job lists #77544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1297288
Add support for skipJobTriggers
oharan2 Apr 8, 2026
2297919
Add poc job
oharan2 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ci-operator/config/rhpit/interop-tests/rhpit-interop-tests-main__weekly_trigger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,16 @@ tests:
- ref: trigger-jobs-trig-check-resource-owner
test:
- ref: trigger-jobs
- as: tmp-interop-jobs-trigger
cron: 0 20 * * 0
steps:
cluster_profile: aws-cspi-qe
env:
JT__POST_TASK_EXEC_FLGS: "0"
JT__TRIG_COND_EXEC_FLGS: "1"
JT__TRIG_JOB_LIST: tmp-test-jobs-list
test:
- ref: trigger-jobs
zz_generated_metadata:
branch: main
org: rhpit
Expand Down
83 changes: 83 additions & 0 deletions ci-operator/jobs/rhpit/interop-tests/rhpit-interop-tests-main-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,3 +790,86 @@ periodics:
- name: result-aggregator
secret:
secretName: result-aggregator
- agent: kubernetes
cluster: build03
cron: 0 20 * * 0
decorate: true
decoration_config:
skip_cloning: true
extra_refs:
- base_ref: main
org: rhpit
repo: interop-tests
labels:
ci-operator.openshift.io/cloud: aws
ci-operator.openshift.io/cloud-cluster-profile: aws-cspi-qe
ci-operator.openshift.io/variant: weekly_trigger
ci.openshift.io/generator: prowgen
job-release: "4.22"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: periodic-ci-rhpit-interop-tests-main-weekly_trigger-tmp-interop-jobs-trigger
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --lease-server-credentials-file=/etc/boskos/credentials
- --report-credentials-file=/etc/report/credentials
- --secret-dir=/secrets/ci-pull-credentials
- --target=tmp-interop-jobs-trigger
- --variant=weekly_trigger
command:
- ci-operator
env:
- name: HTTP_SERVER_IP
valueFrom:
fieldRef:
fieldPath: status.podIP
image: quay-proxy.ci.openshift.org/openshift/ci:ci_ci-operator_latest
imagePullPolicy: Always
name: ""
ports:
- containerPort: 8080
name: http
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/boskos
name: boskos
readOnly: true
- mountPath: /secrets/ci-pull-credentials
name: ci-pull-credentials
readOnly: true
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: boskos
secret:
items:
- key: credentials
path: credentials
secretName: boskos-credentials
- name: ci-pull-credentials
secret:
secretName: ci-pull-credentials
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
4 changes: 3 additions & 1 deletion ci-operator/step-registry/trigger-jobs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ The two sources of data are:
```json
[
{
"skipJobTriggers": false,
"trigCond": [
{
"trigCondFlgs": 1,
Expand Down Expand Up @@ -285,7 +286,8 @@ This Step will do the following:
the bitwise mask `(trigCondFlgs & JT__TRIG_COND_EXEC_FLGS)` evaluates to non-0. If any checked trigger condition is not met, the rest
of the processing is skipped.
4. **(If applicable)** Loop through the jobs-to-trigger JSON and trigger each Job that has `active: true` and matches the set trigger condition, if any.
This Step is skipped if `JT__SKIP_TRIG_MAIN_JOBS` is non-zero.
For each JSON list object, its `jobList` block is skipped when `skipJobTriggers` key is set to true.
If the step env `JT__SKIP_TRIG_MAIN_JOBS` is non-zero (set in the `ci-operator` config), every `jobList` item is skipped the same way.
5. **(If applicable)** Set execution markers so the downstream processes can determine whether to execute post-Steps. Markers are only set when
the bitwise mask `(postTaskFlgs & JT__POST_TASK_EXEC_FLGS)` evaluates to non-0.
6. Continue processing until all Jobs have been processed.
Expand Down
21 changes: 17 additions & 4 deletions ci-operator/step-registry/trigger-jobs/trigger-jobs-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ typeset jobList='' jobType='' jobName='' stepName=''
typeset postTask='' postTaskStep='' postTaskPars=''
typeset rsp=''
typeset -i trigCondFlgs=0 postTaskFlgs=0 jobExecType=0
typeset -i skipJobTriggers=0
typeset -i dryRun=0 tryLeft=0 retryWait=60
typeset -a failedJobs=()
# https://github.com/kubernetes-sigs/prow/blob/95b2a34128de51a4f618c8d6bb9d0c6b587fd29c/pkg/gangway/gangway.proto#L108
Expand Down Expand Up @@ -94,8 +95,8 @@ cmd1EOF
((rsp == 200)) || { echo "Endpoint is still not available after 60 retries. Aborting." 1>&2; exit 1; }
fi

while IFS=$'\t' read -r trigCond jobList postTask; do
: "Processing: ${trigCond@Q} ${jobList@Q} ${postTask@Q}"
while IFS=$'\t' read -r trigCond jobList postTask skipJobTriggers; do
: "Processing: ${trigCond@Q} ${jobList@Q} ${postTask@Q} skipJobTriggers=${skipJobTriggers@Q}"
# Trigger Conditions Check.
while IFS=$'\t' read -r trigCondFlgs trigCondStep trigCondPars; do
: "Processing: ${trigCondFlgs@Q} ${trigCondStep@Q} ${trigCondPars@Q}"
Expand Down Expand Up @@ -181,7 +182,14 @@ cmd1EOF
done
((rsp == 200)) || failedJobs+=("${jobName}")
done 0< <(
((JT__SKIP_TRIG_MAIN_JOBS)) && exit
((JT__SKIP_TRIG_MAIN_JOBS)) && {
echo 'Skipping job list: JT__SKIP_TRIG_MAIN_JOBS is non-zero in this run.' >&2
exit
}
((skipJobTriggers)) && {
echo 'Skipping job list: skipJobTriggers is true for this JSON element.' >&2
exit
}
jq -cr '
.[] |
select(.active == true) |
Expand Down Expand Up @@ -243,7 +251,12 @@ done 0< <(jq -cr '
else
.
end
) | [(.trigCond//[] | @json), (.jobList//[] | @json), (.postTask//[] | @json)] | @tsv
) | [
(.trigCond//[] | @json),
(.jobList//[] | @json),
(.postTask//[] | @json),
(if (.skipJobTriggers // false) then 1 else 0 end | tostring)
] | @tsv
Comment on lines +254 to +259
Copy link
Copy Markdown
Contributor

@etirta etirta Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If a master switch is desired, then it should be treated as if the whole entry is undefined or excluded:

Suggested change
) | [
(.trigCond//[] | @json),
(.jobList//[] | @json),
(.postTask//[] | @json),
(if (.skipJobTriggers // false) then 1 else 0 end | tostring)
] | @tsv
) | select(.disabled != true) |
[(.trigCond//[] | @json), (.jobList//[] | @json), (.postTask//[] | @json)] | @tsv

Remove all other changes.

' "${jobDescFile}")

# Print the list of failed jobs after the loop completes.
Expand Down
2 changes: 2 additions & 0 deletions ci-operator/step-registry/trigger-jobs/trigger-jobs-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ ref:
```json
[
{
"skipJobTriggers": <true|false>, # Optional. Master switch: if true,
# skip all `jobList` triggers; `postTask` still runs.
Comment on lines +24 to +25
Copy link
Copy Markdown
Contributor

@etirta etirta Apr 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First, the master switch Key name could be confused with just skipping the trigCond. Following an idiomatic approach and borrowing from other frameworks such as Systemd Units and many CI Configs, a simple Key name like disabled can be used without any ambiguity.

Second, use [...] to indicate the default value.

Suggested change
"skipJobTriggers": <true|false>, # Optional. Master switch: if true,
# skip all `jobList` triggers; `postTask` still runs.
"disabled": <true|[false]>, # Optional. Set to `true` to skip this entry entirely.

"trigCond": [ # Optional.
{
"trigCondFlgs": <ci-operator-step-trigger-condition-execution-flags>,
Expand Down