Merge branch 'main' into fix-nightly

Author: Alex-Welsh

ansible/inventory/group_vars/all/package-repos

@@ -68,7 +68,7 @@ deb_package_repos:
     policy: immediate
     architectures: amd64
     components: main
-    distributions: focal-updates/yoga jammy-updates/zed jammy-updates/antelope
+    distributions: focal-updates/yoga jammy-updates/zed jammy-updates/antelope jammy-updates/caracal
     mirror: true
     mode: verbatim
     base_path: ubuntu-cloud-archive/
@@ -389,7 +389,7 @@ rpm_package_repos:
     short_name: mariadb_10_6_centos8
     sync_group: third_party
     distribution_name: mariadb-10.6-centos8
-  # RabbitMQ - Erlang for Redhat family, version 8/9 agnostic
+  # RabbitMQ - Erlang for Redhat family, version 8
   - name: RabbitMQ - Erlang
     url: https://packagecloud.io/rabbitmq/erlang/el/8/x86_64
     # mirror_complete fails with:
@@ -399,7 +399,7 @@ rpm_package_repos:
     short_name: rabbitmq_erlang
     sync_group: third_party
     distribution_name: rabbitmq-erlang-
-  # RabbitMQ for Redhat family, version 8/9 agnostic
+  # RabbitMQ for Redhat family, version 8
   - name: RabbitMQ - Server
     url: https://packagecloud.io/rabbitmq/rabbitmq-server/el/8/x86_64
     # mirror_complete fails with:
@@ -856,22 +856,59 @@ rpm_package_repos:
     short_name: centos_stream_9_openstack_antelope
     sync_group: centos
     distribution_name: centos-stream-9-openstack-antelope-
+  # OpenStack Caracal for CentOS Stream 9
+  - name: CentOS Stream 9 - OpenStack Caracal
+    url: https://mirror.stream.centos.org/SIGs/9-stream/cloud/x86_64/openstack-caracal/
+    base_path: centos/9-stream/cloud/x86_64/openstack-caracal/
+    short_name: centos_stream_9_openstack_caracal
+    distribution_name: centos-stream-9-openstack-caracal-
 
   # Additional RHEL 9 repositories
+  # RabbitMQ - Erlang for Redhat family, version 9
+  - name: RabbitMQ - Erlang - RHEL 9
+    url: https://packagecloud.io/rabbitmq/erlang/el/9/x86_64
+    # mirror_complete fails with:
+    # "This repository uses features which are incompatible with 'mirror' sync. Please sync without mirroring enabled"
+    sync_policy: mirror_content_only
+    base_path: rabbitmq/erlang/el/9/x86_64/
+    short_name: rhel9_rabbitmq_erlang
+    distribution_name: rhel9-rabbitmq-erlang-
+  # RabbitMQ for Redhat family, version 9
+  - name: RabbitMQ - Server - RHEL 9
+    url: https://packagecloud.io/rabbitmq/rabbitmq-server/el/9/x86_64
+    # mirror_complete fails with:
+    # "This repository uses features which are incompatible with 'mirror' sync. Please sync without mirroring enabled"
+    sync_policy: mirror_content_only
+    base_path: rabbitmq/rabbitmq-server/el/9/x86_64/
+    short_name: rhel9_rabbitmq_server
+    distribution_name: rhel9-rabbitmq-server-
   # TreasureData 4 for RHEL 9
   - name: TreasureData 4 - RHEL 9
     url: http://packages.treasuredata.com/4/redhat/9/x86_64
     base_path: treasuredata/4/redhat/9/x86_64/
     short_name: rhel_9_treasuredata_4
     sync_group: third_party
-    distribution_name: rhel_9_treasuredata-4-  
+    distribution_name: rhel_9_treasuredata-4-
+  # TreasureData 5 for RHEL 9
+  - name: TreasureData 5 - RHEL 9
+    url: https://packages.treasuredata.com/lts/5/redhat/9/x86_64
+    base_path: treasuredata/lts/5/redhat/9/x86_64/
+    short_name: rhel_9_treasuredata_5
+    sync_group: third_party
+    distribution_name: rhel_9_treasuredata-5-
   # MariaDB 10.6 for RHEL 9
   - name: MariaDB 10.6 - RHEL 9
     url: https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/9/x86_64
     base_path: mariadb-10.6/yum/rhel/9/x86_64/
     short_name: rhel_9_mariadb_10_6
     sync_group: third_party
     distribution_name: mariadb-10.6-rhel-9-
+  # MariaDB 10.11 for RHEL 9
+  - name: MariaDB 10.11 - RHEL 9
+    url: https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/9/x86_64
+    base_path: mariadb-10.11/yum/rhel/9/x86_64/
+    short_name: rhel_9_mariadb_10_11
+    distribution_name: mariadb-10.11-rhel-9-
   # InfluxDB for RHEL 9
   - name: InfluxDB - RHEL 9
     url: https://repos.influxdata.com/rhel/9/x86_64/stable/

ansible/inventory/group_vars/all/source-repositories

@@ -284,6 +284,22 @@ source_repositories:
       - codeowners:
           content: "{{ community_files.codeowners.openstack }}"
           dest: ".github/CODEOWNERS"
+  ovn-octavia-provider:
+    ignored_releases:
+      - victoria
+      - wallaby
+      - xena
+      - yoga
+      - zed
+      - 2024.1
+    workflows:
+      ignored_workflows:
+        elsewhere:
+          - tox
+    community_files:
+      - codeowners:
+          content: "{{ community_files.codeowners.openstack }}"
+          dest: ".github/CODEOWNERS"
   sahara-dashboard:
     ignored_releases:
       - victoria

docs/usage/source-code-ci.md

@@ -27,7 +27,7 @@ The table below contains the different workflows with a description of each and
 
 OpenStack use [Tox](https://wiki.openstack.org/wiki/Testing) to manage the unit tests and style checks for the various projects they maintain.
 Therefore, when a `pull request` is opened the tox workflow will automatically perform a series of unit tests and linting in order ensure correctness and style guidelines are being met.
-The python environment will depend on the branch pre-Zed, python 3.6 and python 3.8 will be tested. From Zed onward, python 3.8 and python 3.10 will be tested.
+The python environment will depend on the branch pre-Zed, python 3.6 and python 3.8 will be tested. From Zed onward, python 3.8 and python 3.10 will be tested, though only python 3.10 will be required for Caracal.
 This can be controlled within the strategy matrix of the workflow.
 The Python versions should correspond to those used in the supported OS distributions for a particular release.
 The source for the workflow can be found [here](https://github.com/stackhpc/.github/blob/main/.github/workflows/tox.yml).

terraform/github/branches.tf

@@ -100,11 +100,11 @@ resource "github_branch_protection" "kayobe_branch_protection_py_3-6" {
   }
 }
 
-resource "github_branch_protection" "kayobe_branch_protection_py_3-10" {
+resource "github_branch_protection" "kayobe_branch_protection_zed" {
   for_each      = toset(var.repositories["Kayobe"])
   repository_id = data.github_repository.repositories[each.key].node_id
 
-  pattern                         = "stackhpc/[z,2]*"
+  pattern                         = "stackhpc/zed"
   require_conversation_resolution = true
   allows_deletions                = false
   allows_force_pushes             = false
@@ -120,7 +120,7 @@ resource "github_branch_protection" "kayobe_branch_protection_py_3-10" {
   ]
 
   required_status_checks {
-    contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/[z,2]*", lookup(var.required_status_checks, each.key, {
+    contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/zed", lookup(var.required_status_checks, each.key, {
       "default" : [
         "tox / Tox pep8 with Python 3.10",
         "tox / Tox py3 with Python 3.10",
@@ -135,6 +135,75 @@ resource "github_branch_protection" "kayobe_branch_protection_py_3-10" {
   }
 }
 
+resource "github_branch_protection" "kayobe_branch_protection_antelope" {
+  for_each      = toset(var.repositories["Kayobe"])
+  repository_id = data.github_repository.repositories[each.key].node_id
+
+  pattern                         = "stackhpc/2023.1"
+  require_conversation_resolution = true
+  allows_deletions                = false
+  allows_force_pushes             = false
+
+  required_pull_request_reviews {
+    dismiss_stale_reviews           = true
+    require_code_owner_reviews      = true
+    required_approving_review_count = 1
+  }
+
+  push_restrictions = [
+    resource.github_team.organisation_teams["Developers"].node_id
+  ]
+
+  required_status_checks {
+    contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/2023.1", lookup(var.required_status_checks, each.key, {
+      "default" : [
+        "tox / Tox pep8 with Python 3.10",
+        "tox / Tox py3 with Python 3.10",
+        "tox / Tox py3 with Python 3.8"
+      ]
+    }).default)
+    strict = false
+  }
+
+  lifecycle {
+    prevent_destroy = true
+  }
+}
+
+resource "github_branch_protection" "kayobe_branch_protection_caracal" {
+  for_each      = toset(var.repositories["Kayobe"])
+  repository_id = data.github_repository.repositories[each.key].node_id
+
+  pattern                         = "stackhpc/2024.1"
+  require_conversation_resolution = true
+  allows_deletions                = false
+  allows_force_pushes             = false
+
+  required_pull_request_reviews {
+    dismiss_stale_reviews           = true
+    require_code_owner_reviews      = true
+    required_approving_review_count = 1
+  }
+
+  push_restrictions = [
+    resource.github_team.organisation_teams["Developers"].node_id
+  ]
+
+  required_status_checks {
+    contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/2024.1", lookup(var.required_status_checks, each.key, {
+      "default" : [
+        "tox / Tox pep8 with Python 3.10",
+        "tox / Tox py3 with Python 3.10"
+      ]
+    }).default)
+    strict = false
+  }
+
+  lifecycle {
+    prevent_destroy = true
+  }
+}
+
 resource "github_branch_protection" "openstack_branch_protection_py_3-6" {
   for_each      = toset(var.repositories["OpenStack"])
   repository_id = data.github_repository.repositories[each.key].node_id
@@ -173,11 +242,11 @@ resource "github_branch_protection" "openstack_branch_protection_py_3-6" {
   }
 }
 
-resource "github_branch_protection" "openstack_branch_protection_py_3-10" {
+resource "github_branch_protection" "openstack_branch_protection_zed" {
   for_each      = toset(var.repositories["OpenStack"])
   repository_id = data.github_repository.repositories[each.key].node_id
 
-  pattern                         = "stackhpc/[z,2]*"
+  pattern                         = "stackhpc/zed"
   require_conversation_resolution = true
   allows_deletions                = false
   allows_force_pushes             = false
@@ -193,7 +262,7 @@ resource "github_branch_protection" "openstack_branch_protection_py_3-10" {
   }
 
   required_status_checks {
-    contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/[z,2]*", lookup(var.required_status_checks, each.key, {
+    contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/zed", lookup(var.required_status_checks, each.key, {
       "default" : [
         "tox / Tox pep8 with Python 3.10",
         "tox / Tox py3 with Python 3.10",
@@ -208,6 +277,75 @@ resource "github_branch_protection" "openstack_branch_protection_py_3-10" {
   }
 }
 
+resource "github_branch_protection" "openstack_branch_protection_antelope" {
+  for_each      = toset(var.repositories["OpenStack"])
+  repository_id = data.github_repository.repositories[each.key].node_id
+
+  pattern                         = "stackhpc/2023.1"
+  require_conversation_resolution = true
+  allows_deletions                = false
+  allows_force_pushes             = false
+
+  push_restrictions = [
+    resource.github_team.organisation_teams["Developers"].node_id
+  ]
+
+  required_pull_request_reviews {
+    dismiss_stale_reviews           = true
+    require_code_owner_reviews      = true
+    required_approving_review_count = 1
+  }
+
+  required_status_checks {
+    contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/2023.1", lookup(var.required_status_checks, each.key, {
+      "default" : [
+        "tox / Tox pep8 with Python 3.10",
+        "tox / Tox py3 with Python 3.10",
+        "tox / Tox py3 with Python 3.8"
+      ]
+    }).default)
+    strict = false
+  }
+
+  lifecycle {
+    prevent_destroy = false
+  }
+}
+
+resource "github_branch_protection" "openstack_branch_protection_caracal" {
+  for_each      = toset(var.repositories["OpenStack"])
+  repository_id = data.github_repository.repositories[each.key].node_id
+
+  pattern                         = "stackhpc/2024.1"
+  require_conversation_resolution = true
+  allows_deletions                = false
+  allows_force_pushes             = false
+
+  push_restrictions = [
+    resource.github_team.organisation_teams["Developers"].node_id
+  ]
+
+  required_pull_request_reviews {
+    dismiss_stale_reviews           = true
+    require_code_owner_reviews      = true
+    required_approving_review_count = 1
+  }
+
+  required_status_checks {
+    contexts = lookup(lookup(var.required_status_checks, each.key, {}), "stackhpc/2024.1", lookup(var.required_status_checks, each.key, {
+      "default" : [
+        "tox / Tox pep8 with Python 3.10",
+        "tox / Tox py3 with Python 3.10"
+      ]
+    }).default)
+    strict = false
+  }
+
+  lifecycle {
+    prevent_destroy = false
+  }
+}
+
 resource "github_branch_protection" "platform_branch_protection" {
   for_each      = toset(var.repositories["Platform"])
   repository_id = data.github_repository.repositories[each.key].node_id

terraform/github/import_resources.py

@@ -3,7 +3,7 @@
 """
 Import existing GitHub resources from the `stackhpc` organisation
 so that they maybe managed by Terraform. It shall only import resources
-that are defined within the `terraform.tfvars.json` file nd are currently
+that are defined within the `terraform.tfvars.json` file and are currently
 available on GitHub.
 """
 
@@ -223,9 +223,17 @@ def main() -> None:
             branch_protection_resource = BranchProtection(team_id.name.lower(
             ), {f"{name}:stackhpc/[vwxy]*": name for name in team_repositories}, parsed_args.dry_run, "_py_3-6")
             branch_protection_resource.refresh_resource()
-            # Post-Zed branch protection
+            # Zed branch protection
             branch_protection_resource = BranchProtection(team_id.name.lower(
-            ), {f"{name}:stackhpc/[z,2]*": name for name in team_repositories}, parsed_args.dry_run, "_py_3-10")
+            ), {f"{name}:stackhpc/zed": name for name in team_repositories}, parsed_args.dry_run, "_zed")
+            branch_protection_resource.refresh_resource()
+            # Antelope branch protection
+            branch_protection_resource = BranchProtection(team_id.name.lower(
+            ), {f"{name}:stackhpc/2023.1": name for name in team_repositories}, parsed_args.dry_run, "_antelope")
+            branch_protection_resource.refresh_resource()
+            # Caracal branch protection
+            branch_protection_resource = BranchProtection(team_id.name.lower(
+            ), {f"{name}:stackhpc/2024.1": name for name in team_repositories}, parsed_args.dry_run, "_caracal")
             branch_protection_resource.refresh_resource()
         else:
             branch_protection_resource = BranchProtection(team_id.name.lower(