Skip to content

Commit

Permalink
DO NOT MERGE: temp for testing noble against staging using CI
Browse files Browse the repository at this point in the history
  • Loading branch information
orndorffgrant committed Mar 21, 2024
1 parent 9ef9fc6 commit 22cec43
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
18 changes: 2 additions & 16 deletions .github/workflows/ci-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-22.04
strategy:
matrix:
release: ['xenial', 'bionic', 'focal', 'jammy', 'mantic'] # , 'noble'] TODO flake8 is broken in noble as of Feb 21 2024. Add back once python3-flake8 >6 (currently in -proposed) gets into noble
release: ['noble']
steps:
- name: Prepare build tools
env:
Expand Down Expand Up @@ -65,23 +65,9 @@ jobs:
# as much information as possible from them.
fail-fast: false
matrix:
release: ['bionic', 'focal', 'jammy', 'mantic', 'noble']
release: ['noble']
platform: ['lxd-container']
host_os: ['ubuntu-22.04']
include:
# xenial lxd containers dont work on hosts >20.04
- release: xenial
platform: lxd-container
host_os: ubuntu-20.04
- release: bionic
platform: aws.pro
host_os: ubuntu-22.04
- release: bionic
platform: gcp.pro
host_os: ubuntu-22.04
- release: bionic
platform: aws.pro-fips
host_os: ubuntu-22.04
steps:
- name: Prepare test tools
run: |
Expand Down
3 changes: 3 additions & 0 deletions features/cloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ def _check_cloudinit_status(
"""
result = instance.execute(["cloud-init", "status", "--wait", "--long"])

logging.info("--- cloud-init might've failed but oh well")
return

if result.failed:
raise OSError(
"cloud-init failed to start\n: out: %s\n error: %s"
Expand Down

0 comments on commit 22cec43

Please sign in to comment.