diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 7b382c6cd03..cdb66c3e410 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -130,8 +130,6 @@ stages: test: alpine3 - name: CentOS 7 test: centos7 - - name: Fedora 35 - test: fedora35 - name: Fedora 36 test: fedora36 - name: openSUSE 15 @@ -149,8 +147,6 @@ stages: targets: - name: Alpine 3 test: alpine3 - - name: Fedora 35 - test: fedora35 - name: Fedora 36 test: fedora36 - name: Ubuntu 22.04 diff --git a/changelogs/fragments/ansible-test-fedora-35.yml b/changelogs/fragments/ansible-test-fedora-35.yml new file mode 100644 index 00000000000..26650305af9 --- /dev/null +++ b/changelogs/fragments/ansible-test-fedora-35.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Remove Fedora 35 test container. diff --git a/changelogs/fragments/ansible-test-more-remotes.yml b/changelogs/fragments/ansible-test-more-remotes.yml index 6ac97de5da6..7eb1615011e 100644 --- a/changelogs/fragments/ansible-test-more-remotes.yml +++ b/changelogs/fragments/ansible-test-more-remotes.yml @@ -2,4 +2,4 @@ minor_changes: - ansible-test - Add support for provisioning remotes which require ``doas`` for become. - ansible-test - Add support for provisioning Ubuntu 20.04 remote instances. - ansible-test - Add support for provisioning Alpine 3.16 remote instances. - - ansible-test - Add support for provisioning Fedora 35 and 36 remote instances. + - ansible-test - Add support for provisioning Fedora 36 remote instances. diff --git a/test/lib/ansible_test/_data/completion/docker.txt b/test/lib/ansible_test/_data/completion/docker.txt index 1d244c09304..e6dd3c344eb 100644 --- a/test/lib/ansible_test/_data/completion/docker.txt +++ b/test/lib/ansible_test/_data/completion/docker.txt @@ -3,7 +3,6 @@ default image=quay.io/ansible/default-test-container:6.7.0 python=3.10,2.7,3.5,3 default image=quay.io/ansible/ansible-core-test-container:6.7.0 python=3.10,2.7,3.5,3.6,3.7,3.8,3.9,3.11 seccomp=unconfined context=ansible-core alpine3 image=quay.io/ansible/alpine3-test-container:4.6.0 python=3.10 centos7 image=quay.io/ansible/centos7-test-container:4.6.0 python=2.7 seccomp=unconfined -fedora35 image=quay.io/ansible/fedora35-test-container:4.6.0 python=3.10 seccomp=unconfined fedora36 image=quay.io/ansible/fedora36-test-container:4.6.0 python=3.10 seccomp=unconfined opensuse15 image=quay.io/ansible/opensuse15-test-container:4.6.0 python=3.6 ubuntu2004 image=quay.io/ansible/ubuntu2004-test-container:4.6.0 python=3.8 seccomp=unconfined diff --git a/test/lib/ansible_test/_data/completion/remote.txt b/test/lib/ansible_test/_data/completion/remote.txt index 301cb8f3f76..192298bf0f4 100644 --- a/test/lib/ansible_test/_data/completion/remote.txt +++ b/test/lib/ansible_test/_data/completion/remote.txt @@ -1,6 +1,5 @@ alpine/3.16 python=3.10 become=doas_sudo provider=aws arch=x86_64 alpine become=doas_sudo provider=aws arch=x86_64 -fedora/35 python=3.10 become=sudo provider=aws arch=x86_64 fedora/36 python=3.10 become=sudo provider=aws arch=x86_64 fedora become=sudo provider=aws arch=x86_64 freebsd/12.3 python=3.8 python_dir=/usr/local/bin become=su_sudo provider=aws arch=x86_64