Skip to content

Commit

Permalink
Merge pull request #324 from stackhpc/upstream/2023.1-2024-07-15
Browse files Browse the repository at this point in the history
Synchronise 2023.1 with upstream
  • Loading branch information
markgoddard authored Jul 16, 2024
2 parents 4b1c880 + 46989bd commit 84a3af4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .zuul.d/debian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
kolla_registry: dockerhub
kolla_namespace: kolla
secrets:
- kolla_dockerhub_creds
- kolla_dockerhub_credentials

- job:
name: kolla-publish-debian-quay
Expand All @@ -75,7 +75,7 @@
kolla_registry: dockerhub
kolla_namespace: kolla
secrets:
- kolla_dockerhub_creds
- kolla_dockerhub_credentials

- job:
name: kolla-publish-debian-aarch64-quay
Expand Down
2 changes: 1 addition & 1 deletion .zuul.d/rocky.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
kolla_registry: dockerhub
kolla_namespace: kolla
secrets:
- kolla_dockerhub_creds
- kolla_dockerhub_credentials

- job:
name: kolla-publish-rocky9-quay
Expand Down
2 changes: 1 addition & 1 deletion .zuul.d/ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
kolla_registry: dockerhub
kolla_namespace: kolla
secrets:
- kolla_dockerhub_creds
- kolla_dockerhub_credentials

- job:
name: kolla-publish-ubuntu-quay
Expand Down
4 changes: 2 additions & 2 deletions doc/source/contributor/release-management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ This needs to be done for each of the following projects:

* https://launchpad.net/ansible-collection-kolla

* https://launchpad.net/kayobe

At the beginning of a cycle, ensure a named series exists for the cycle in each
project. If not, create one via the project landing page (e.g.
https://launchpad.net/kolla) - in the "Series and milestones" section click in
"Register a series". Once the series has been created, create the necessary
milestones, including the final release. Series can be marked as "Active
Development" or "Current Stable Release" as necessary.

Kayobe uses Storyboard, which does not track series or milestones.

Milestones
----------

Expand Down

0 comments on commit 84a3af4

Please sign in to comment.