From d0421dcd2b464468a72e855023888b32ba66c421 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Fri, 10 Feb 2023 21:45:19 +0100
Subject: [PATCH 1/3] .zuul: Enable testing on Fedora 37

https://github.com/containers/toolbox/pull/1237
---
 .zuul.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index f714e8cee..5e27c7041 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -48,6 +48,17 @@
     pre-run: playbooks/setup-env.yaml
     run: playbooks/system-test.yaml
 
+- job:
+    name: system-test-fedora-37
+    description: Run Toolbx's system tests in Fedora 37
+    timeout: 2400
+    nodeset:
+      nodes:
+        - name: fedora-37
+          label: cloud-fedora-37
+    pre-run: playbooks/setup-env.yaml
+    run: playbooks/system-test.yaml
+
 - job:
     name: system-test-fedora-36
     description: Run Toolbx's system tests in Fedora 36
@@ -74,6 +85,7 @@
     periodic:
       jobs:
         - system-test-fedora-rawhide
+        - system-test-fedora-37
         - system-test-fedora-36
         - system-test-fedora-35
     check:
@@ -81,6 +93,7 @@
         - unit-test
         - unit-test-migration-path-for-coreos-toolbox
         - system-test-fedora-rawhide
+        - system-test-fedora-37
         - system-test-fedora-36
         - system-test-fedora-35
     gate:
@@ -88,5 +101,6 @@
         - unit-test
         - unit-test-migration-path-for-coreos-toolbox
         - system-test-fedora-rawhide
+        - system-test-fedora-37
         - system-test-fedora-36
         - system-test-fedora-35

From 419e4e8cd9b4bb5d3e721e6ef3b925bd5de541b5 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Fri, 10 Feb 2023 21:54:12 +0100
Subject: [PATCH 2/3] .zuul: Drop testing on Fedora 35

Fedora 35 reached End of Life on 13th December 2022:
https://docs.fedoraproject.org/en-US/releases/eol/

https://github.com/containers/toolbox/pull/1237
---
 .zuul.yaml | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 5e27c7041..71d85c39d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -70,24 +70,12 @@
     pre-run: playbooks/setup-env.yaml
     run: playbooks/system-test.yaml
 
-- job:
-    name: system-test-fedora-35
-    description: Run Toolbox's system tests in Fedora 35
-    timeout: 2400
-    nodeset:
-      nodes:
-        - name: fedora-35
-          label: cloud-fedora-35
-    pre-run: playbooks/setup-env.yaml
-    run: playbooks/system-test.yaml
-
 - project:
     periodic:
       jobs:
         - system-test-fedora-rawhide
         - system-test-fedora-37
         - system-test-fedora-36
-        - system-test-fedora-35
     check:
       jobs:
         - unit-test
@@ -95,7 +83,6 @@
         - system-test-fedora-rawhide
         - system-test-fedora-37
         - system-test-fedora-36
-        - system-test-fedora-35
     gate:
       jobs:
         - unit-test
@@ -103,4 +90,3 @@
         - system-test-fedora-rawhide
         - system-test-fedora-37
         - system-test-fedora-36
-        - system-test-fedora-35

From 2a5f20e1b45b926da820facfa073e26709e01e31 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <rishi@fedoraproject.org>
Date: Fri, 10 Feb 2023 22:00:16 +0100
Subject: [PATCH 3/3] doc/toolbox, doc/toolbox-run: Refer to a newer Fedora
 release

Fedora 35 reached End of Life on 13th December 2022:
https://docs.fedoraproject.org/en-US/releases/eol/

https://github.com/containers/toolbox/pull/1237
---
 doc/toolbox-run.1.md | 4 ++--
 doc/toolbox.1.md     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/toolbox-run.1.md b/doc/toolbox-run.1.md
index c65a15e41..4495d4d3d 100644
--- a/doc/toolbox-run.1.md
+++ b/doc/toolbox-run.1.md
@@ -63,7 +63,7 @@ failed to run or why it exited.
 $ toolbox run /etc; echo $?
 /bin/sh: line 1: /etc: Is a directory
 /bin/sh: line 1: exec: /etc: cannot execute: Is a directory
-Error: failed to invoke command /etc in container fedora-toolbox-35
+Error: failed to invoke command /etc in container fedora-toolbox-36
 126
 ```
 
@@ -72,7 +72,7 @@ Error: failed to invoke command /etc in container fedora-toolbox-35
 ```
 $ toolbox run foo; echo $?
 /bin/sh: line 1: exec: foo: not found
-Error: command foo not found in container fedora-toolbox-35
+Error: command foo not found in container fedora-toolbox-36
 127
 ```
 
diff --git a/doc/toolbox.1.md b/doc/toolbox.1.md
index c3635090c..d5658100d 100644
--- a/doc/toolbox.1.md
+++ b/doc/toolbox.1.md
@@ -57,7 +57,7 @@ specifies its version. Supported combinations are:
 
 Distro |Release
 -------|----------
-fedora |\<release\> or f\<release\> eg., 35 or f35
+fedora |\<release\> or f\<release\> eg., 36 or f36
 rhel   |\<major\>.\<minor\> eg., 8.5
 
 ## GLOBAL OPTIONS ##