Skip to content

Commit cd3a0fc

Browse files
committed
fix(ISV-7101): Make add-bundle-to-fbc run after publish-to-index before finally block
1 parent 8157d0b commit cd3a0fc

1 file changed

Lines changed: 42 additions & 42 deletions

File tree

ansible/roles/operator-pipeline/templates/openshift/pipelines/operator-release-pipeline.yml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -401,48 +401,6 @@ spec:
401401
- name: registry-credentials
402402
workspace: registry-serve-credentials
403403

404-
# Automatically add bundle to FBC based on operators release config file
405-
- name: add-bundle-to-fbc
406-
runAfter:
407-
- publish-pyxis-data
408-
taskRef:
409-
kind: Task
410-
name: add-bundle-to-fbc
411-
when:
412-
- input: "$(tasks.detect-changes.results.added_bundle)"
413-
operator: notin
414-
values: [""]
415-
params:
416-
- name: pipeline_image
417-
value: "$(params.pipeline_image)"
418-
- name: bundle_pullspec
419-
value: "$(tasks.copy-bundle-image-to-released-registry.results.image_pullspec)"
420-
- name: operator_name
421-
value: "$(tasks.detect-changes.results.added_operator)"
422-
- name: operator_version
423-
value: "$(tasks.detect-changes.results.added_bundle)"
424-
- name: git_base_branch
425-
value: "$(params.git_base_branch)"
426-
- name: github_origin_pr_url
427-
value: "$(params.git_pr_url)"
428-
- name: github_token_secret_name
429-
value: "$(params.github_token_secret_name)"
430-
- name: github_token_secret_key
431-
value: "$(params.github_token_secret_key)"
432-
- name: create_pull_request
433-
value: "true"
434-
workspaces:
435-
- name: source
436-
workspace: repository
437-
subPath: src
438-
- name: output
439-
workspace: results
440-
subPath: summary
441-
- name: ssh-directory
442-
workspace: ssh-dir
443-
- name: registry-credentials
444-
workspace: registry-pull-credentials
445-
446404
# Get the bundle versions to build index
447405
- name: get-supported-versions
448406
runAfter:
@@ -650,6 +608,48 @@ spec:
650608
- name: results
651609
workspace: results
652610

611+
# Automatically add bundle to FBC based on operators release config file
612+
- name: add-bundle-to-fbc
613+
runAfter:
614+
- publish-to-index
615+
taskRef:
616+
kind: Task
617+
name: add-bundle-to-fbc
618+
when:
619+
- input: "$(tasks.detect-changes.results.added_bundle)"
620+
operator: notin
621+
values: [""]
622+
params:
623+
- name: pipeline_image
624+
value: "$(params.pipeline_image)"
625+
- name: bundle_pullspec
626+
value: "$(tasks.copy-bundle-image-to-released-registry.results.image_pullspec)"
627+
- name: operator_name
628+
value: "$(tasks.detect-changes.results.added_operator)"
629+
- name: operator_version
630+
value: "$(tasks.detect-changes.results.added_bundle)"
631+
- name: git_base_branch
632+
value: "$(params.git_base_branch)"
633+
- name: github_origin_pr_url
634+
value: "$(params.git_pr_url)"
635+
- name: github_token_secret_name
636+
value: "$(params.github_token_secret_name)"
637+
- name: github_token_secret_key
638+
value: "$(params.github_token_secret_key)"
639+
- name: create_pull_request
640+
value: "true"
641+
workspaces:
642+
- name: source
643+
workspace: repository
644+
subPath: src
645+
- name: output
646+
workspace: results
647+
subPath: summary
648+
- name: ssh-directory
649+
workspace: ssh-dir
650+
- name: registry-credentials
651+
workspace: registry-pull-credentials
652+
653653
finally:
654654

655655
# Release the acquired resource

0 commit comments

Comments
 (0)