Skip to content

Commit ed6d03c

Browse files
committed
UnixPB: Add RHEL clause to git download method
Revert "UnixPB: Add RHEL clause to git download method" This reverts commit 82190f1. UnixPB: Add RHEL6 clause for Git_Source Download
1 parent 341a45c commit ed6d03c

File tree

1 file changed

+5
-2
lines changed
  • ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks

1 file changed

+5
-2
lines changed

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/GIT_Source/tasks/main.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
- (git_installed.rc != 0 ) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.15', operator='lt'))
4343
- ansible_distribution != "FreeBSD"
4444
- ansible_distribution != "CentOS" or ansible_distribution_major_version | int != 6
45+
- ansible_distribution != "RedHat" or ansible_distribution_major_version | int != 6
4546
tags: git_source
4647

4748
- name: Download git source for CentOS 6
@@ -50,7 +51,8 @@
5051
warn: false
5152
when:
5253
- (git_installed.rc != 0 ) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.15', operator='lt'))
53-
- ansible_distribution == "CentOS" and ansible_distribution_major_version | int == 6
54+
- (ansible_distribution == "CentOS" or ansible_distribution == "RedHat")
55+
- ansible_distribution_major_version | int == 6
5456
tags: git_source
5557

5658
- name: Verify checksum for CentOS 6 Git Source download ...
@@ -59,7 +61,8 @@
5961
failed_when: "'107116489f10b758b51af1c5dbdb9a274917b0fb67dc8eaefcdabc7bc3eb3e6a' not in checksum_result.stdout"
6062
when:
6163
- (git_installed.rc != 0 ) or (git_installed.rc == 0 and git_version.stdout is version_compare('2.15', operator='lt'))
62-
- ansible_distribution == "CentOS" and ansible_distribution_major_version | int == 6
64+
- (ansible_distribution == "CentOS" or ansible_distribution == "RedHat")
65+
- ansible_distribution_major_version | int == 6
6366
tags: git_source
6467

6568
- name: Extract git source

0 commit comments

Comments
 (0)