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.

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

ansible-test: change Fedora 24, 25 to 28, 29 (#49586) - 2.6 #49588

Merged
merged 4 commits into from Dec 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions shippable.yml
Expand Up @@ -50,8 +50,8 @@ matrix:
- env: T=freebsd/11.1/1
- env: T=linux/centos6/1
- env: T=linux/centos7/1
- env: T=linux/fedora24/1
- env: T=linux/fedora25/1
- env: T=linux/fedora28/1
- env: T=linux/fedora29/1
- env: T=linux/opensuse42.3/1
- env: T=linux/ubuntu1404/1
- env: T=linux/ubuntu1604/1
Expand All @@ -62,8 +62,8 @@ matrix:
- env: T=freebsd/11.1/2
- env: T=linux/centos6/2
- env: T=linux/centos7/2
- env: T=linux/fedora24/2
- env: T=linux/fedora25/2
- env: T=linux/fedora28/2
- env: T=linux/fedora29/2
- env: T=linux/opensuse42.3/2
- env: T=linux/ubuntu1404/2
- env: T=linux/ubuntu1604/2
Expand All @@ -74,8 +74,8 @@ matrix:
- env: T=freebsd/11.1/3
- env: T=linux/centos6/3
- env: T=linux/centos7/3
- env: T=linux/fedora24/3
- env: T=linux/fedora25/3
- env: T=linux/fedora28/3
- env: T=linux/fedora29/3
- env: T=linux/opensuse42.3/3
- env: T=linux/ubuntu1404/3
- env: T=linux/ubuntu1604/3
Expand Down
9 changes: 9 additions & 0 deletions test/integration/targets/yum/tasks/main.yml
Expand Up @@ -47,6 +47,9 @@
when:
- ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux', 'Fedora']
- ansible_python.version.major == 2
# yum in Fedora 28 is deprecated and does not support boolean (rich) dependencies used in the tests.
# https://bugzilla.redhat.com/show_bug.cgi?id=1489315
- not (ansible_distribution == 'Fedora' and ansible_distribution_version == '28')

- block:
- include: 'repo.yml'
Expand All @@ -59,6 +62,9 @@
when:
- ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux', 'Fedora']
- ansible_python.version.major == 2
# yum in Fedora 28 is deprecated and does not support boolean (rich) dependencies used in the tests.
# https://bugzilla.redhat.com/show_bug.cgi?id=1489315
- not (ansible_distribution == 'Fedora' and ansible_distribution_version == '28')

# We can't run yum --installroot tests on dnf systems. Dnf systems revert to
# yum-deprecated, and yum-deprecated refuses to run if yum.conf exists
Expand All @@ -76,3 +82,6 @@
when:
- (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and ansible_distribution_major_version|int > 6) or ansible_distribution in ['Fedora']
- ansible_python.version.major == 2
# yum in Fedora 28 is deprecated and does not support boolean (rich) dependencies used in the tests.
# https://bugzilla.redhat.com/show_bug.cgi?id=1489315
- not (ansible_distribution == 'Fedora' and ansible_distribution_version == '28')
6 changes: 2 additions & 4 deletions test/runner/completion/docker.txt
@@ -1,10 +1,8 @@
default name=quay.io/ansible/default-test-container:1.4.1 python=3
centos6 name=quay.io/ansible/centos6-test-container:1.4.0 seccomp=unconfined
centos7 name=quay.io/ansible/centos7-test-container:1.4.0 seccomp=unconfined
fedora24 name=quay.io/ansible/fedora24-test-container:1.4.0 seccomp=unconfined
fedora25 name=quay.io/ansible/fedora25-test-container:1.4.0 seccomp=unconfined
fedora26py3 name=quay.io/ansible/fedora26py3-test-container:1.4.0 python=3
fedora27py3 name=quay.io/ansible/fedora27py3-test-container:1.4.0 python=3
fedora28 name=quay.io/ansible/fedora28-test-container:1.5.0
fedora29 name=quay.io/ansible/fedora29-test-container:1.5.0 python=3
opensuse42.3 name=quay.io/ansible/opensuse42.3-test-container:1.4.0 seccomp=unconfined
ubuntu1404 name=quay.io/ansible/ubuntu1404-test-container:1.4.0 seccomp=unconfined
ubuntu1604 name=quay.io/ansible/ubuntu1604-test-container:1.4.0 seccomp=unconfined
Expand Down