Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master: Rename Caracal/2024.1 to Master #1487

Open
wants to merge 5 commits into
base: stackhpc/master
Choose a base branch
from
Open

Master: Rename Caracal/2024.1 to Master #1487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8fa8e96
sed s/2024.1/master
Alex-Welsh Feb 3, 2025
148730d
sed s/caracal/master
Alex-Welsh Feb 3, 2025
d7289e6
Update release tag regex
Alex-Welsh Feb 3, 2025
87661d6
Bump ansible-lint python requirements
Alex-Welsh Feb 3, 2025
10aa813
Update AIO workflow previous release to 2024.1
Alex-Welsh Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/stackhpc-all-in-one.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-build-kayobe-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
push:
branches:
# NOTE(upgrade): Reference only the current release branch here.
- stackhpc/2024.1
- stackhpc/master

workflow_call:
inputs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-multinode.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-promote.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stackhpc-pull-request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .gitreview
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will break github kayobe automation. This file is very much an upstream file.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that upstream master doesn't have a defaultbranch var at all. We do use the file in a few downstream CI workflows

I'm tempted to call it stable/master since that would probably break the least downstream?

That being said I don't know if we'll ever use it with kayobe automation because we're never going to deploy this branch in a prod system (or even staging for that matter).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which bit of kayobe automation will break @jackhodgkiss, the actions? We use it for Tempest in CI, but I don't immediately see why that wouldn't work here.

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
host=review.opendev.org
port=29418
project=openstack/kayobe-config.git
defaultbranch=stable/2024.1
defaultbranch=master
2 changes: 1 addition & 1 deletion .readthedocs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions doc/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/environments/aufn-ceph.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
=============
Expand Down
6 changes: 3 additions & 3 deletions doc/source/contributor/environments/ci-aio.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/environments/ci-builder.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ and pushed there once built.
.. warning::

This guide was written for the Yoga release and has not been validated for
Caracal. Proceed with caution.
Master. Proceed with caution.

In general it is preferable to use the `container image build CI workflow
<https://github.com/stackhpc/stackhpc-kayobe-config/actions/workflows/stackhpc-container-image-build.yml>`_
Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/environments/ci-multinode.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Multinode Test Environment
.. warning::

This guide was written for the Yoga release and has not been validated for
Caracal. Proceed with caution.
Master. Proceed with caution.

The ``ci-multinode`` environment provides a Kayobe configuration for multi-node
clouds to be used for test and development purposes. It is designed to be used
Expand Down
10 changes: 5 additions & 5 deletions doc/source/contributor/package-updates.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ This section describes the Release Train process of creating new package reposit
Preparations
============

1. Before building images, you should check for any outstanding PRs into the earliest supported release. Below are the links for the 2024.1 (Caracal) branches.
1. Before building images, you should check for any outstanding PRs into the earliest supported release. Below are the links for the Master branches.

kayobe-config: https://github.com/stackhpc/stackhpc-kayobe-config/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2F2024.1
kayobe-config: https://github.com/stackhpc/stackhpc-kayobe-config/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2Fmaster

kolla: https://github.com/stackhpc/kolla/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2F2024.1
kolla: https://github.com/stackhpc/kolla/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2Fmaster

kolla-ansible: https://github.com/stackhpc/kolla-ansible/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2F2024.1
kolla-ansible: https://github.com/stackhpc/kolla-ansible/pulls?q=is%3Apr+is%3Aopen+base%3Astackhpc%2Fmaster

You should also check any referenced source trees in etc/kayobe/kolla.yml.

Expand Down Expand Up @@ -165,7 +165,7 @@ Upgrading OpenStack to the next release in a multinode environment
.. warning::

This guide was written for the Wallaby release and has not been validated
for Caracal. Proceed with caution.
for master. Proceed with caution.

As this is not a full production system, only a reduced number of steps need to be followed to upgrade to a new release. Below describes these steps, with ``stackhpc/wallaby`` as the starting branch:

Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/testing-ci-automation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ job.
The workflow performs the following high-level steps:

#. Deploy a VM on an OpenStack cloud using the `aio
<https://github.com/stackhpc/stackhpc-kayobe-config/tree/stackhpc/2024.1/terraform/aio>`_
<https://github.com/stackhpc/stackhpc-kayobe-config/tree/stackhpc/master/terraform/aio>`_
Terraform configuration.
#. Deploy OpenStack in the VM using Kayobe and the :doc:`ci-aio
<environments/ci-aio>` environment. If this is an upgrade job, the previous
Expand Down
Loading
Loading