Merge pull request #1487 from stackhpc/master-renames

Master: Rename Caracal/2024.1 to Master

Author: Alex-Welsh

.github/workflows/stackhpc-all-in-one.yml

@@ -93,9 +93,9 @@ jobs:
       KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
       KAYOBE_IMAGE: ${{ inputs.kayobe_image }}
       # NOTE(upgrade): Reference the PREVIOUS release here.
-      PREVIOUS_KAYOBE_IMAGE: ghcr.io/stackhpc/stackhpc-kayobe-config:stackhpc-2023.1
+      PREVIOUS_KAYOBE_IMAGE: ghcr.io/stackhpc/stackhpc-kayobe-config:stackhpc-2024.1
       # NOTE(upgrade): Reference the PREVIOUS release branch here.
-      PREVIOUS_BRANCH: stackhpc/2023.1
+      PREVIOUS_BRANCH: stackhpc/2024.1
     steps:
       - name: Install Package
         uses: ConorMacBride/install-package@main

.github/workflows/stackhpc-build-kayobe-image.yml

@@ -8,7 +8,7 @@ on:
   push:
     branches:
       # NOTE(upgrade): Reference only the current release branch here.
-      - stackhpc/2024.1
+      - stackhpc/master
 
   workflow_call:
     inputs:

.github/workflows/stackhpc-multinode.yml

@@ -70,6 +70,6 @@ jobs:
       ssh_key: ${{ inputs.ssh_key }}
       stackhpc_kayobe_config_version: ${{ github.ref_name }}
       # NOTE(upgrade): Reference the PREVIOUS release here.
-      stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2023.1' || 'stackhpc/2024.1' }}
+      stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/master' }}
       terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }}
     secrets: inherit

.github/workflows/stackhpc-promote.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       # NOTE(upgrade): Reference only the current release branch here.
-      - stackhpc/2024.1
+      - stackhpc/master
 jobs:
   promote:
     name: Trigger Pulp promotion workflows

.github/workflows/stackhpc-pull-request.yml

@@ -69,9 +69,9 @@ jobs:
       matrix:
         include:
           # NOTE(upgrade): Keep these in sync with Kayobe's supported Ansible and Python versions (see release notes).
-          - ansible: "2.16"
+          - ansible: "2.17"
             python: "3.12"
-          - ansible: "2.15"
+          - ansible: "2.16"
             python: "3.10"
     name: Ansible ${{ matrix.ansible }} lint with Python ${{ matrix.python }}
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe-config.git
-defaultbranch=stable/2024.1
+defaultbranch=master

.readthedocs.yaml

@@ -13,7 +13,7 @@ build:
     python: "3.7"
   jobs:
     post_checkout:
-      - git remote set-branches origin master stackhpc/2024.1 stackhpc/2023.1 stackhpc/zed stackhpc/yoga stackhpc/xena stackhpc/wallaby
+      - git remote set-branches origin master stackhpc/master stackhpc/2024.1 stackhpc/2023.1 stackhpc/zed stackhpc/yoga stackhpc/xena stackhpc/wallaby
       - git fetch --unshallow
 
 # Build documentation in the doc/source/ directory with Sphinx

doc/source/conf.py

@@ -29,8 +29,8 @@
 # -- StackHPC Kayobe configuration --------------------------------------
 # Variables to override
 
-current_series = "2024.1"
-previous_series = "2023.1"
+current_series = "master"
+previous_series = "2024.1"
 branch = f"stackhpc/{current_series}"
 ceph_series = "squid"
 

doc/source/contributor/environments/aufn-ceph.rst

@@ -9,7 +9,7 @@ This environment creates a Universe-from-nothing_-style deployment of Kayobe con
 .. warning::
 
     This guide was written for the Yoga release and has not been validated for
-    Caracal. Proceed with caution.
+    Master. Proceed with caution.
 
 Prerequisites
 =============

doc/source/contributor/environments/ci-aio.rst

@@ -29,7 +29,7 @@ Download the setup script:
 
 .. parsed-literal::
 
-   wget https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/2024.1/etc/kayobe/environments/ci-aio/automated-setup.sh
+   wget https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/master/etc/kayobe/environments/ci-aio/automated-setup.sh
 
 Change the permissions on the script:
 
@@ -52,9 +52,9 @@ following options:
 
 * ``BASE_PATH`` (default: ``~``) - Directory to deploy from. The directory must
   exist before running the script.
-* ``KAYOBE_BRANCH`` (default: ``stackhpc/2024.1``) - The branch of Kayobe
+* ``KAYOBE_BRANCH`` (default: ``stackhpc/master``) - The branch of Kayobe
   source code to use.
-* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/2024.1``) - The branch of
+* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/master``) - The branch of
   ``stackhpc-kayobe-config`` to use.
 * ``KAYOBE_AIO_LVM`` (default: ``true``) - Whether the image uses LVM.
 * ``KAYOBE_CONFIG_EDIT_PAUSE`` (default: ``false``) - Option to pause