Skip to content
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

feat: disable Centos 7 on s390x architecture #622

Closed
wants to merge 1 commit into from
Closed

feat: disable Centos 7 on s390x architecture #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions automation/test-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ if [ "$TARGET" == "centos6" ] && [ "$(uname -m)" == "s390x" ]; then
exit 1
fi

if [ "$TARGET" == "centos7" ] && [ "$(uname -m)" == "s390x" ]; then
echo "CentOS 7 does not support s390x."
exit 1
fi

image_url=""
#set secret_ref only for rhel OSes
secret_ref=""
Expand Down
2 changes: 2 additions & 0 deletions generate-templates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@
set_fact:
centos7_containerdisk_urls: "{{ lookup('osinfo', 'centos7.0') |attr('image_list') |selectattr('architecture', 'eq', 'x86_64') |selectattr('format', 'eq', 'containerdisk') |map(attribute='url') |map('replace', 'docker://', '') |list }}"
centos7_image_urls: "{{ lookup('osinfo', 'centos7.0') |attr('image_list') |selectattr('architecture', 'eq', 'x86_64') |selectattr('format', 'in', ['raw', 'qcow2']) |map(attribute='url') |list }}"
when: ansible_architecture != "s390x"

- name: Generate CentOS 7 templates
template:
Expand All @@ -199,6 +200,7 @@
cloudusername: centos
containerdisk_urls: "{{ centos7_containerdisk_urls }}"
image_urls: "{{ centos7_image_urls }}"
when: ansible_architecture != "s390x"

- name: Load CentOS 6 versions
set_fact:
Expand Down
Loading