Skip to content

Commit bc69c97

Browse files
authored
Merge pull request #1487 from stackhpc/master-renames
Master: Rename Caracal/2024.1 to Master
2 parents 77ea637 + 10aa813 commit bc69c97

33 files changed

+72
-289
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ jobs:
9393
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
9494
KAYOBE_IMAGE: ${{ inputs.kayobe_image }}
9595
# NOTE(upgrade): Reference the PREVIOUS release here.
96-
PREVIOUS_KAYOBE_IMAGE: ghcr.io/stackhpc/stackhpc-kayobe-config:stackhpc-2023.1
96+
PREVIOUS_KAYOBE_IMAGE: ghcr.io/stackhpc/stackhpc-kayobe-config:stackhpc-2024.1
9797
# NOTE(upgrade): Reference the PREVIOUS release branch here.
98-
PREVIOUS_BRANCH: stackhpc/2023.1
98+
PREVIOUS_BRANCH: stackhpc/2024.1
9999
steps:
100100
- name: Install Package
101101
uses: ConorMacBride/install-package@main

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
push:
99
branches:
1010
# NOTE(upgrade): Reference only the current release branch here.
11-
- stackhpc/2024.1
11+
- stackhpc/master
1212

1313
workflow_call:
1414
inputs:

.github/workflows/stackhpc-multinode.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,6 @@ jobs:
7070
ssh_key: ${{ inputs.ssh_key }}
7171
stackhpc_kayobe_config_version: ${{ github.ref_name }}
7272
# NOTE(upgrade): Reference the PREVIOUS release here.
73-
stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2023.1' || 'stackhpc/2024.1' }}
73+
stackhpc_kayobe_config_previous_version: ${{ inputs.upgrade == 'major' && 'stackhpc/2024.1' || 'stackhpc/master' }}
7474
terraform_kayobe_multinode_version: ${{ inputs.terraform_kayobe_multinode_version }}
7575
secrets: inherit

.github/workflows/stackhpc-promote.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
# NOTE(upgrade): Reference only the current release branch here.
7-
- stackhpc/2024.1
7+
- stackhpc/master
88
jobs:
99
promote:
1010
name: Trigger Pulp promotion workflows

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ jobs:
6969
matrix:
7070
include:
7171
# NOTE(upgrade): Keep these in sync with Kayobe's supported Ansible and Python versions (see release notes).
72-
- ansible: "2.16"
72+
- ansible: "2.17"
7373
python: "3.12"
74-
- ansible: "2.15"
74+
- ansible: "2.16"
7575
python: "3.10"
7676
name: Ansible ${{ matrix.ansible }} lint with Python ${{ matrix.python }}
7777
if: github.repository == 'stackhpc/stackhpc-kayobe-config'

.gitreview

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
host=review.opendev.org
33
port=29418
44
project=openstack/kayobe-config.git
5-
defaultbranch=stable/2024.1
5+
defaultbranch=master

.readthedocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ build:
1313
python: "3.7"
1414
jobs:
1515
post_checkout:
16-
- git remote set-branches origin master stackhpc/2024.1 stackhpc/2023.1 stackhpc/zed stackhpc/yoga stackhpc/xena stackhpc/wallaby
16+
- git remote set-branches origin master stackhpc/master stackhpc/2024.1 stackhpc/2023.1 stackhpc/zed stackhpc/yoga stackhpc/xena stackhpc/wallaby
1717
- git fetch --unshallow
1818

1919
# Build documentation in the doc/source/ directory with Sphinx

doc/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
# -- StackHPC Kayobe configuration --------------------------------------
3030
# Variables to override
3131

32-
current_series = "2024.1"
33-
previous_series = "2023.1"
32+
current_series = "master"
33+
previous_series = "2024.1"
3434
branch = f"stackhpc/{current_series}"
3535
ceph_series = "squid"
3636

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This environment creates a Universe-from-nothing_-style deployment of Kayobe con
99
.. warning::
1010

1111
This guide was written for the Yoga release and has not been validated for
12-
Caracal. Proceed with caution.
12+
Master. Proceed with caution.
1313

1414
Prerequisites
1515
=============

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Download the setup script:
2929

3030
.. parsed-literal::
3131
32-
wget https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/2024.1/etc/kayobe/environments/ci-aio/automated-setup.sh
32+
wget https://raw.githubusercontent.com/stackhpc/stackhpc-kayobe-config/stackhpc/master/etc/kayobe/environments/ci-aio/automated-setup.sh
3333
3434
Change the permissions on the script:
3535

@@ -52,9 +52,9 @@ following options:
5252

5353
* ``BASE_PATH`` (default: ``~``) - Directory to deploy from. The directory must
5454
exist before running the script.
55-
* ``KAYOBE_BRANCH`` (default: ``stackhpc/2024.1``) - The branch of Kayobe
55+
* ``KAYOBE_BRANCH`` (default: ``stackhpc/master``) - The branch of Kayobe
5656
source code to use.
57-
* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/2024.1``) - The branch of
57+
* ``KAYOBE_CONFIG_BRANCH`` (default: ``stackhpc/master``) - The branch of
5858
``stackhpc-kayobe-config`` to use.
5959
* ``KAYOBE_AIO_LVM`` (default: ``true``) - Whether the image uses LVM.
6060
* ``KAYOBE_CONFIG_EDIT_PAUSE`` (default: ``false``) - Option to pause

0 commit comments

Comments
 (0)