From ffc8bc146e87da2d452da64a8c7d8ec303006e9a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Oct 2023 12:01:43 -0400
Subject: [PATCH 1/4] ci: Drop package install at build time

This is unnecessary now.
---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 574a4d9..1c5682e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,6 @@ test-build:
     - merge_requests
   stage: build
   script:
-    - rpm-ostree install distribution-gpg-keys
     - set -euo pipefail; rpm-ostree compose image --format=ociarchive --initialize ${OS}-${TIER}${VARIANT}-${VERSION}.yaml dest.oci-archive
 
 build-push:

From ffcc6aabef6061966890d79fa7241b36ce421c59 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Oct 2023 13:12:59 -0400
Subject: [PATCH 2/4] Add -dev eln versions too

---
 .gitlab-ci.yml             | 9 +--------
 fedora-tier-0-dev-eln.yaml | 3 +++
 fedora-tier-1-dev-eln.yaml | 3 +++
 3 files changed, 7 insertions(+), 8 deletions(-)
 create mode 100644 fedora-tier-0-dev-eln.yaml
 create mode 100644 fedora-tier-1-dev-eln.yaml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1c5682e..b1c1c56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,15 +19,8 @@ stages:
           - tier-0
           - tier-1
         OS: fedora
-        VERSION: ["38"]
+        VERSION: ["38", "eln"]
         VARIANT: ["", "-dev"]
-      # TODO add -dev for eln
-      - TIER:
-          - tier-0
-          - tier-1
-        OS: fedora
-        VERSION: ["eln"]
-        VARIANT: [""]
 .default-target: fedora-tier-1-38
 
 test-build:
diff --git a/fedora-tier-0-dev-eln.yaml b/fedora-tier-0-dev-eln.yaml
new file mode 100644
index 0000000..584a2cd
--- /dev/null
+++ b/fedora-tier-0-dev-eln.yaml
@@ -0,0 +1,3 @@
+include:
+  - fedora-tier-0-38.yaml
+  - fedora-dev.yaml
diff --git a/fedora-tier-1-dev-eln.yaml b/fedora-tier-1-dev-eln.yaml
new file mode 100644
index 0000000..16b5266
--- /dev/null
+++ b/fedora-tier-1-dev-eln.yaml
@@ -0,0 +1,3 @@
+include:
+  - fedora-tier-1-eln.yaml
+  - fedora-dev.yaml

From d09a8f5e28f5430b46b63ba9b329e377feca0dbd Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Oct 2023 13:17:07 -0400
Subject: [PATCH 3/4] README.md: Expand matrix

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 7d4327f..6ecebdf 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,8 @@ users and passwords that way.
 
 - `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-0:38`
 - `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-1:38`
+- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-0:eln`
+- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-1:eln`
 
 # Image matrix (CentOS Stream 9)
 
@@ -47,6 +49,13 @@ users and passwords that way.
 - `registry.gitlab.com/centos/cloud/sagano/centos-boot-tier-1:stream9`
 - `registry.gitlab.com/centos/cloud/sagano/centos-boot-tier-1-rt:stream9` (realtime kernel)
 
+# Image matrix (Fedora development)
+
+These images pull from git main/master of RPMs using COPRs for selected projects.
+
+- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-0-dev:38`
+- `registry.gitlab.com/centos/cloud/sagano/fedora-boot-tier-1-dev:38`
+
 ## More about image sources
 
 The current manifest definitions [tier-0](tier-0) and [tier-1](tier-1) were forked from Fedora CoreOS, but significantly

From 31bf478ff02572c842c1661a80281da7cc707bc0 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Oct 2023 14:13:04 -0400
Subject: [PATCH 4/4] eln: Adjust releasever to 39 for now for COPR

---
 fedora-tier-0-eln.yaml | 2 +-
 fedora-tier-1-eln.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fedora-tier-0-eln.yaml b/fedora-tier-0-eln.yaml
index 0a9d7c3..6be213d 100644
--- a/fedora-tier-0-eln.yaml
+++ b/fedora-tier-0-eln.yaml
@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 39
 
 repos:
   - eln-baseos
diff --git a/fedora-tier-1-eln.yaml b/fedora-tier-1-eln.yaml
index 67872af..dce0d59 100644
--- a/fedora-tier-1-eln.yaml
+++ b/fedora-tier-1-eln.yaml
@@ -1,4 +1,4 @@
-releasever: 40
+releasever: 39
 
 repos:
   - eln-baseos