Skip to content

Commit

Permalink
DLPX-92585 Fix merge failure in cloud-init
Browse files Browse the repository at this point in the history
  • Loading branch information
pcd1193182 committed Nov 1, 2024
2 parents e7c8a8d + bc2c47c commit 343a61c
Show file tree
Hide file tree
Showing 301 changed files with 22,852 additions and 3,462 deletions.
7 changes: 6 additions & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
documentation:
- doc/*
- all:
- changed-files:
- any-glob-to-any-file:
- 'doc/**'
- 'cloudinit/config/schemas/**'
- base-branch: ['main']
2 changes: 1 addition & 1 deletion .github/workflows/check_format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
matrix:
env: [ruff, mypy, pylint, black, isort]
name: Check ${{ matrix.env }}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: "Checkout #1"
uses: actions/[email protected]
Expand Down
12 changes: 0 additions & 12 deletions .github/workflows/doc-autolabel.yml

This file was deleted.

9 changes: 9 additions & 0 deletions .github/workflows/labeler.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: PR Labeler
on:
- pull_request_target

jobs:
labeler:
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5
47 changes: 47 additions & 0 deletions .github/workflows/packaging-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Packaging Tests

on:
pull_request:
branches:
- 'ubuntu/**'

concurrency:
group: 'ci-${{ github.workflow }}-${{ github.ref }}'
cancel-in-progress: true

defaults:
run:
shell: sh -ex {0}

env:
RELEASE: focal

jobs:
check-patches:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3
with:
# Fetch all branches for merging
fetch-depth: 0
- name: Prepare dependencies
run: |
sudo DEBIAN_FRONTEND=noninteractive apt-get update
sudo DEBIAN_FRONTEND=noninteractive apt-get -y install tox quilt
- name: Setup quilt environment
run: |
echo 'QUILT_PATCHES=debian/patches' >> ~/.quiltrc
echo 'QUILT_SERIES=debian/patches/series' >> ~/.quiltrc
- name: 'Daily recipe: quilt patches apply successfully and tests run'
run: |
git config user.name "GitHub Actions"
git config user.email "[email protected]"
git remote add upstream https://git.launchpad.net/cloud-init
git fetch upstream main
git checkout upstream/main
git merge ${{ github.sha }}
quilt push -a
tox -e py3
quilt pop -a
10 changes: 6 additions & 4 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,21 @@ jobs:
unittests:
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
toxenv: [py3]
slug: [""]
experimental: [false]
check-latest: [false]
continue-on-error: [false]
include:
- python-version: "3.6"
- python-version: "3.8"
toxenv: lowest-supported
slug: (lowest-supported)
continue-on-error: false
check-latest: false
experimental: false
name: unittest / ${{ matrix.toxenv }} / python ${{matrix.python-version}}
runs-on: ubuntu-20.04
name: Python ${{matrix.python-version}} ${{ matrix.slug }}
runs-on: ubuntu-22.04
continue-on-error: ${{ matrix.experimental }}
steps:
- name: "Checkout"
Expand Down
2 changes: 2 additions & 0 deletions .pc/applied-patches
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,5 @@ retain-ec2-default-net-update-events.patch
cli-retain-file-argument-as-main-cmd-arg.patch
drop-unsupported-systemd-condition-environment.patch
deprecation-version-boundary.patch
no-single-process.patch
no-nocloud-network.patch
Loading

0 comments on commit 343a61c

Please sign in to comment.