From 28ef5b432cae03c4da3edbc6bf4856e85c5165f1 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 12 Sep 2023 15:08:55 +0200 Subject: [PATCH] images: Drop fedora-testing This got replaced with the nightly runs. --- README.md | 15 --------------- image-trigger | 2 -- images/fedora-testing | 1 - images/scripts/fedora-testing.bootstrap | 1 - images/scripts/fedora-testing.setup | 1 - lib/testmap.py | 9 --------- machine/machine_core/machine.py | 6 +++--- naughty/fedora-testing | 1 - 8 files changed, 3 insertions(+), 33 deletions(-) delete mode 120000 images/fedora-testing delete mode 120000 images/scripts/fedora-testing.bootstrap delete mode 120000 images/scripts/fedora-testing.setup delete mode 120000 naughty/fedora-testing diff --git a/README.md b/README.md index cddbd8875a..450d59845e 100644 --- a/README.md +++ b/README.md @@ -212,21 +212,6 @@ used as default OS for test VMs. 1. If this is a new image, add `_manual` test contexts for the new image to `lib/testmap.py`, and land that into `main`. 2. Create a PR that updates `TEST_OS_DEFAULT` in `lib/constants.py`, and trigger all tests for that image there. -#### Fedora testing image - -The `fedora-testing` image is a Fedora image with updates-testing enabled, -the version of the image is determined by what the -`fedora-testing.bootstrap` symlink points too. - -To update the Fedora version used: - -1. Update the `fedora-testing.bootstrap` symlink to the latest Fedora - release. -2. Update the naughty symlink `naughty/fedora-testing` to the latest - Fedora release. -3. Create a new PR and refresh the image. - - #### Fedora CoreOS The Fedora CoreOS image is updated to a new Fedora release out of our diff --git a/image-trigger b/image-trigger index 3b6bffb9c4..363bcb8984 100755 --- a/image-trigger +++ b/image-trigger @@ -42,8 +42,6 @@ REFRESH = { "fedora-38": {}, "fedora-39": {}, "fedora-39-boot": {}, - "fedora-testing": {"refresh-days": 3}, - "fedora-coreos": {}, "fedora-rawhide": {}, "fedora-rawhide-boot": {}, "fedora-rawhide-anaconda-payload": {"refresh-days": 30}, diff --git a/images/fedora-testing b/images/fedora-testing deleted file mode 120000 index e2caa0f541..0000000000 --- a/images/fedora-testing +++ /dev/null @@ -1 +0,0 @@ -fedora-testing-8e7d6eb5e07703d5c2630012dd9573ecf2fb5f20d857cbea1fe7b213d52100cf.qcow2 \ No newline at end of file diff --git a/images/scripts/fedora-testing.bootstrap b/images/scripts/fedora-testing.bootstrap deleted file mode 120000 index 289fc85547..0000000000 --- a/images/scripts/fedora-testing.bootstrap +++ /dev/null @@ -1 +0,0 @@ -fedora-38.bootstrap \ No newline at end of file diff --git a/images/scripts/fedora-testing.setup b/images/scripts/fedora-testing.setup deleted file mode 120000 index f78434e0cb..0000000000 --- a/images/scripts/fedora-testing.setup +++ /dev/null @@ -1 +0,0 @@ -fedora.setup \ No newline at end of file diff --git a/lib/testmap.py b/lib/testmap.py index f33d881151..cb54520f9f 100644 --- a/lib/testmap.py +++ b/lib/testmap.py @@ -61,7 +61,6 @@ def contexts(image, *scenarios: Iterable[str]): ], # These can be triggered manually with bots/tests-trigger '_manual': [ - 'fedora-testing', 'fedora-rawhide', ], }, @@ -97,7 +96,6 @@ def contexts(image, *scenarios: Iterable[str]): '_manual': [ 'centos-8-stream', 'fedora-rawhide', - 'fedora-testing', ], }, 'cockpit-project/cockpit-machines': { @@ -117,7 +115,6 @@ def contexts(image, *scenarios: Iterable[str]): ], '_manual': [ 'fedora-rawhide', - 'fedora-testing', ], }, 'weldr/lorax': { @@ -222,12 +219,6 @@ def contexts(image, *scenarios: Iterable[str]): # only put auxiliary images here; triggers for primary OS images are computed from testmap IMAGE_REFRESH_TRIGGERS = { - "fedora-testing": [ - "fedora-testing@cockpit-project/cockpit", - "fedora-testing/daily@cockpit-project/cockpit", - "fedora-testing@cockpit-project/cockpit-machines", - "fedora-testing@cockpit-project/cockpit-podman", - ], # some tests run against centos-7's cockpit-ws for backwards compat testing "centos-7": [ TEST_OS_DEFAULT + "@cockpit-project/cockpit", diff --git a/machine/machine_core/machine.py b/machine/machine_core/machine.py index 935585b243..a3cb6be3a0 100644 --- a/machine/machine_core/machine.py +++ b/machine/machine_core/machine.py @@ -196,15 +196,15 @@ def allowed_messages(self): # Default PAM configuration logs motd for cockpit-session allowed.append(".*cockpit-session: pam: Web console: .*") - if self.image in ["fedora-37", "fedora-testing"]: + if self.image in ["fedora-37"]: # https://bugzilla.redhat.com/show_bug.cgi?id=2083900 allowed.append('audit.*denied { sys_admin } .* comm="systemd-gpt-aut".*') - if self.image in ["fedora-37", "fedora-testing", "fedora-coreos"]: + if self.image in ["fedora-37", "fedora-coreos"]: # https://bugzilla.redhat.com/show_bug.cgi?id=2122888 allowed.append('audit.*denied { sys_admin } .* comm="mv" .*NetworkManager_dispatcher_console_t.*') - if self.image in ["fedora-38", "fedora-testing", "fedora-coreos"]: + if self.image in ["fedora-38", "fedora-coreos"]: # https://bugzilla.redhat.com/show_bug.cgi?id=2223571 allowed.append('audit.*denied { sendto } .* comm="systemd-network" ' 'path="/run/systemd/journal/socket".*systemd_network_generator_t.*') diff --git a/naughty/fedora-testing b/naughty/fedora-testing deleted file mode 120000 index 20d5d608fc..0000000000 --- a/naughty/fedora-testing +++ /dev/null @@ -1 +0,0 @@ -fedora-38 \ No newline at end of file