Merge pull request #741 from stackhpc/zed-yoga-merge

zed: yoga merge

Author: markgoddard

.github/path-filters.yml

@@ -0,0 +1,22 @@
+# This file is a list of path filters for the PR workflow in .github/workflows/stackhpc-pull-request.yml.
+aio:
+  - '.automation'
+  - '.automation.conf/config.sh'
+  - '.automation.conf/tempest/load-lists/default'
+  - '.automation.conf/tempest/load-lists/platform.2022.11-test-list.txt'
+  - '.automation.conf/tempest/load-lists/refstack-2019.11-test-list.txt'
+  - '.automation.conf/tempest/tempest-ci-aio.overrides.conf'
+  - '.github/workflows/stackhpc-all-in-one.yml'
+  - '.github/workflows/stackhpc-build-kayobe-image.yml'
+  - '.github/workflows/stackhpc-pull-request.yml'
+  - 'etc/kayobe/*.yml'
+  - 'etc/kayobe/ansible/configure-aio-resources.yml'
+  - 'etc/kayobe/ansible/growroot.yml'
+  - 'etc/kayobe/ansible/requirements.yml'
+  - 'etc/kayobe/ansible/scripts/aio-init.sh'
+  - 'etc/kayobe/environments/ci-aio/**'
+  - 'etc/kayobe/inventory/**'
+  - 'etc/kayobe/kolla/**'
+  - 'kayobe-env'
+  - 'requirements.txt'
+  - 'terraform/aio/**'

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

@@ -51,6 +51,10 @@ on:
         description: Name of cloud in clouds.yaml
         type: string
         required: true
+      if:
+        description: Whether to run the workflow (workaround for required status checks issue)
+        type: boolean
+        default: true
     secrets:
       KAYOBE_VAULT_PASSWORD:
         required: true
@@ -65,6 +69,7 @@ jobs:
   # NOTE: Runner needs unzip and nodejs packages.
   all-in-one:
     name: All in one
+    if: inputs.if
     runs-on: [self-hosted, stackhpc-kayobe-config-aio]
     permissions: {}
     env:

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

@@ -20,6 +20,10 @@ on:
         type: string
         required: false
         default: "rockylinux:9"
+      if:
+        description: Whether to run the workflow (workaround for required status checks issue)
+        type: boolean
+        default: true
     outputs:
       kayobe_image:
         description: Reference of Kayobe image that was built
@@ -32,6 +36,7 @@ env:
 jobs:
   build-kayobe-image:
     name: Build kayobe image
+    if: inputs.if
     runs-on: ubuntu-20.04
     permissions:
       contents: read

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

@@ -8,6 +8,29 @@ name: Pull request
 'on':
   pull_request:
 jobs:
+  # Detect which files have changed and use this to run jobs conditionally.
+  # Note that we can't use the workflow-level paths attribute since this
+  # would skip the workflow entirely, and would prevent us from making the
+  # aio jobs required to pass (a skip counts as a pass).
+  check-changes:
+    runs-on: ubuntu-20.04
+    permissions:
+      pull-requests: read
+    name: Check changed files
+    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+    outputs:
+      aio: ${{ steps.changes.outputs.aio }}
+    steps:
+      - name: GitHub Checkout
+        uses: actions/checkout@v3
+
+      - name: Check changed files
+        uses: dorny/paths-filter@v2
+        id: changes
+        with:
+          # Filters are defined in this file.
+          filters: .github/path-filters.yml
+
   tox:
     runs-on: ubuntu-22.04
     permissions: {}
@@ -36,14 +59,27 @@ jobs:
       - name: Run Tox ${{ matrix.environment }} 🧪
         run: tox -e ${{ matrix.environment }}
 
+  # A skipped job is treated as success when used as a required status check.
+  # The registered required status checks refer to the name of the job in the
+  # called reusable workflow rather than the jobs in this file.  The following
+  # jobs need to run unconditionally to allow GitHub required status checks to
+  # pass even when there are changed files. The `! failure()` condition runs
+  # when the parent jobs completed successfully or were skipped. We pass an
+  # 'if' argument to the called workflow to allow running it conditionally.
+
   build-kayobe-image:
     name: Build Kayobe Image
+    needs:
+      - check-changes
     uses: ./.github/workflows/stackhpc-build-kayobe-image.yml
+    with:
+      if: ${{ needs.check-changes.outputs.aio == 'true' }}
     if: github.repository == 'stackhpc/stackhpc-kayobe-config'
 
   all-in-one-ubuntu-jammy-ovs:
     name: aio (Ubuntu Jammy OVS)
     needs:
+      - check-changes
       - build-kayobe-image
     uses: ./.github/workflows/stackhpc-all-in-one.yml
     with:
@@ -53,12 +89,14 @@ jobs:
       ssh_username: ubuntu
       neutron_plugin: ovs
       OS_CLOUD: sms-lab-release
+      if: ${{ needs.check-changes.outputs.aio == 'true' }}
     secrets: inherit
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+    if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-ubuntu-jammy-ovn:
     name: aio (Ubuntu Jammy OVN)
     needs:
+      - check-changes
       - build-kayobe-image
     uses: ./.github/workflows/stackhpc-all-in-one.yml
     with:
@@ -68,12 +106,14 @@ jobs:
       ssh_username: ubuntu
       neutron_plugin: ovn
       OS_CLOUD: sms-lab-release
+      if: ${{ needs.check-changes.outputs.aio == 'true' }}
     secrets: inherit
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+    if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-rocky-9-ovs:
     name: aio (Rocky 9 OVS)
     needs:
+      - check-changes
       - build-kayobe-image
     uses: ./.github/workflows/stackhpc-all-in-one.yml
     with:
@@ -83,12 +123,14 @@ jobs:
       ssh_username: cloud-user
       neutron_plugin: ovs
       OS_CLOUD: sms-lab-release
+      if: ${{ needs.check-changes.outputs.aio == 'true' }}
     secrets: inherit
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+    if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}
 
   all-in-one-rocky-9-ovn:
     name: aio (Rocky 9 OVN)
     needs:
+      - check-changes
       - build-kayobe-image
     uses: ./.github/workflows/stackhpc-all-in-one.yml
     with:
@@ -98,5 +140,6 @@ jobs:
       ssh_username: cloud-user
       neutron_plugin: ovn
       OS_CLOUD: sms-lab-release
+      if: ${{ needs.check-changes.outputs.aio == 'true' }}
     secrets: inherit
-    if: github.repository == 'stackhpc/stackhpc-kayobe-config'
+    if: ${{ ! failure() && github.repository == 'stackhpc/stackhpc-kayobe-config' }}

etc/kayobe/ansible/purge-command-not-found.yml

@@ -30,4 +30,4 @@
       become: true
       failed_when: false
       ignore_unreachable: true
-      when: ansible_facts.os_family == "Debian"
+      when: os_distribution == "ubuntu"

etc/kayobe/apt.yml

@@ -62,12 +62,18 @@ stackhpc_apt_repositories:
     signed_by: docker.asc
     architecture: amd64
 
-apt_repositories: "{{ stackhpc_apt_repositories }}"
+# Do not replace apt configuration for non-overcloud hosts. This can result in
+# errors if apt reconfiguration is performed before local repository mirrors
+# are deployed.
+apt_repositories: "{{ stackhpc_apt_repositories if 'overcloud' in group_names else [] }}"
 
 # Whether to disable repositories in /etc/apt/sources.list. This may be used
 # when replacing the distribution repositories via apt_repositories.
 # Default is false.
-apt_disable_sources_list: true
+# Do not disable the default apt configuration for non-overcloud hosts. This
+# can result in errors if apt reconfiguration is performed before local
+# repository mirrors are deployed.
+apt_disable_sources_list: "{{ 'overcloud' in group_names }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/environments/aufn-ceph/kolla/inventory/overcloud-services.j2

@@ -480,9 +480,6 @@ storage
 [prometheus-alertmanager:children]
 monitoring
 
-[prometheus-msteams:children]
-monitoring
-
 [prometheus-openstack-exporter:children]
 monitoring
 
@@ -531,3 +528,9 @@ ovn-database
 
 [ovn-sb-db:children]
 ovn-database
+
+[venus-api:children]
+venus
+
+[venus-manager:children]
+venus

etc/kayobe/kolla/globals.yml

@@ -4,7 +4,7 @@
 # To work around issue of trying to install docker from
 # empty pulp server, use upstream docker dnf repo on
 # non-overcloud hosts
-enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names or ansible_facts.os_family == 'Debian' }}{% endraw %}"
+enable_docker_repo: "{% raw %}{{ 'overcloud' not in group_names }}{% endraw %}"
 
 # kolla_base_distro must be set here to be resolvable on a per-host basis
 # This is necessary for os migrations where mixed clouds might be deployed

releasenotes/notes/bump-bifrost-xena-c0c65bd823ed15fa.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Rebuild and bump the Bifrost container for Xena to include fix for
+    `Error while running update_to_latest_versions: ''BIOSSetting''
+    object has no attribute` during `Ironic database migrations on upgrade`
+

releasenotes/notes/disable-non-overcloud-apt-config-5b79b5b63c78779c.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Disabled custom APT configuration for non-overcloud hosts (Ubuntu Only).
+    This resolves the issue of the seed hypervisor attempting to pull packages
+    from the repository on the seed before it has been deployed.