Skip to content

Commit

Permalink
Set content_provider_dlrn_md5_hash default to empty string
Browse files Browse the repository at this point in the history
Earlier we set content_provider_dlrn_md5_hash to nowhere, it breaks
the tcib content provider dependent EDPM job saying nowhere repo not
found.

Returning it to empty string and make sure we set the dlrn_hash_tag
value on non empty string content_provider_dlrn_md5_hash value
fixes the issue.

Signed-off-by: Chandan Kumar <raukadah@gmail.com>
  • Loading branch information
raukadah authored and openshift-merge-bot[bot] committed Feb 26, 2024
1 parent 825de29 commit b6439df
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ci/playbooks/tcib/run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@
msg: >-
Running Content provider registry on
{{ node_ip | default('nowhere') }} with dlrn md5 hash
{{ _dlrn_md5 | default('nowhere') }}
{{ _dlrn_md5 | default('') }}
- name: Set up content registry IP address
zuul_return:
data:
zuul:
pause: true
content_provider_registry_ip: "{{ node_ip | default('nowhere') }}"
content_provider_dlrn_md5_hash: "{{ _dlrn_md5 | default('nowhere') }}"
content_provider_dlrn_md5_hash: "{{ _dlrn_md5 | default('') }}"
4 changes: 3 additions & 1 deletion roles/repo_setup/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
- name: Set cifmw_repo_setup_dlrn_hash_tag from content provider
ansible.builtin.set_fact:
cifmw_repo_setup_dlrn_hash_tag: "{{ content_provider_dlrn_md5_hash }}"
when: content_provider_dlrn_md5_hash is defined
when:
- content_provider_dlrn_md5_hash is defined
- content_provider_dlrn_md5_hash | length > 0

- name: Run repo-setup
become: "{{ not cifmw_repo_setup_output.startswith(ansible_user_dir) }}"
Expand Down

0 comments on commit b6439df

Please sign in to comment.