Skip to content

Commit

Permalink
images: Drop fedora-testing
Browse files Browse the repository at this point in the history
This got replaced with the nightly runs.
  • Loading branch information
martinpitt authored and jelly committed Sep 12, 2023
1 parent 68a6b9c commit 28ef5b4
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 33 deletions.
15 changes: 0 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions image-trigger
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
1 change: 0 additions & 1 deletion images/fedora-testing

This file was deleted.

1 change: 0 additions & 1 deletion images/scripts/fedora-testing.bootstrap

This file was deleted.

1 change: 0 additions & 1 deletion images/scripts/fedora-testing.setup

This file was deleted.

9 changes: 0 additions & 9 deletions lib/testmap.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ def contexts(image, *scenarios: Iterable[str]):
],
# These can be triggered manually with bots/tests-trigger
'_manual': [
'fedora-testing',
'fedora-rawhide',
],
},
Expand Down Expand Up @@ -97,7 +96,6 @@ def contexts(image, *scenarios: Iterable[str]):
'_manual': [
'centos-8-stream',
'fedora-rawhide',
'fedora-testing',
],
},
'cockpit-project/cockpit-machines': {
Expand All @@ -117,7 +115,6 @@ def contexts(image, *scenarios: Iterable[str]):
],
'_manual': [
'fedora-rawhide',
'fedora-testing',
],
},
'weldr/lorax': {
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions machine/machine_core/machine.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.*')
Expand Down
1 change: 0 additions & 1 deletion naughty/fedora-testing

This file was deleted.

0 comments on commit 28ef5b4

Please sign in to comment.