From f702b7458f507ca48608c35de82b0aca6d0dcc51 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emacchi@redhat.com>
Date: Thu, 8 Feb 2024 10:18:35 -0500
Subject: [PATCH 1/2] CI: Add jobs for stable OpenStack versions

---
 .github/workflows/with-defaults.yml | 39 ++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/with-defaults.yml b/.github/workflows/with-defaults.yml
index 99d383f..8b34ef6 100644
--- a/.github/workflows/with-defaults.yml
+++ b/.github/workflows/with-defaults.yml
@@ -4,15 +4,46 @@ on:
 
 jobs:
   with_defaults:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        name: ["master"]
+        openstack_version: ["master"]
+        ubuntu_version: ["22.04"]
+        include:
+          - name: "bobcat"
+            openstack_version: "stable/2023.2"
+            ubuntu_version: "22.04"
+          - name: "antelope"
+            openstack_version: "stable/2023.1"
+            ubuntu_version: "22.04"
+          - name: "zed"
+            openstack_version: "stable/zed"
+            ubuntu_version: "20.04"
+          - name: "yoga"
+            openstack_version: "stable/yoga"
+            ubuntu_version: "20.04"
+          - name: "xena"
+            openstack_version: "stable/xena"
+            ubuntu_version: "20.04"
+          - name: "wallaby"
+            openstack_version: "stable/wallaby"
+            ubuntu_version: "20.04"
+          - name: "victoria"
+            openstack_version: "stable/victoria"
+            ubuntu_version: "20.04"
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}
     name: A job to deploy devstack with defaults
     steps:
-      - uses: actions/checkout@v4
-      - id: devstack-action
+      - name: Checkout devstack-action
+        uses: actions/checkout@v4
+      - name: Deploy devstack
         uses: ./
+        with:
+          branch: ${{ matrix.openstack_version }}
       - name: Upload logs artifacts on failure
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: devstack-logs
+          name: functional-basic-${{ matrix.name }}
           path: /tmp/devstack-logs/*

From 61ac8292568b7c3698283eb6d63b1a4c92a11b3f Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emacchi@redhat.com>
Date: Thu, 8 Feb 2024 10:47:46 -0500
Subject: [PATCH 2/2] action: override TARGET_BRANCH for stable branches

---
 action.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/action.yaml b/action.yaml
index b6573b6..59002e1 100644
--- a/action.yaml
+++ b/action.yaml
@@ -73,6 +73,14 @@ runs:
         if [[ "${{ inputs.conf_overrides }}" != "" ]]; then
           echo "${{ inputs.conf_overrides }}" >> local.conf
         fi
+
+        # Overriding target release for unmaintained versions
+        # otherwide devstack will fail to clone some repos.
+        TARGET_BRANCH=${{ inputs.branch }}
+        if [[ "${{ inputs.branch }}" == *"yoga"* ]]; then
+            TARGET_BRANCH="yoga-eom"
+        fi
+        echo "TARGET_BRANCH=${TARGET_BRANCH}" >> local.conf
       working-directory: ./devstack
       shell: bash
     - name: Run devstack