Skip to content

Commit

Permalink
point reusable jobs to master
Browse files Browse the repository at this point in the history
Signed-off-by: Mauro Morales <[email protected]>
  • Loading branch information
mauromorales committed Jul 18, 2023
1 parent d620459 commit 49c9273
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/image-arm-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ env:

jobs:
docker:
uses: kairos-io/kairos/.github/workflows/reusable-docker-arm-build.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-docker-arm-build.yaml@master
with:
flavor: opensuse-leap-arm-rpi
model: rpi64
worker: ubuntu-latest

image_and_iso_arm64_generic:
uses: kairos-io/kairos/.github/workflows/reusable-image-and-iso-arm-generic.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-image-and-iso-arm-generic.yaml@master
with:
flavor: opensuse-leap-arm-rpi
4 changes: 2 additions & 2 deletions .github/workflows/image-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
echo "::set-output name=matrix::{\"include\": $content }"
docker:
uses: kairos-io/kairos/.github/workflows/reusable-docker-arm-build.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-docker-arm-build.yaml@master
with:
flavor: ${{ matrix.flavor }}
model: ${{ matrix.model }}
Expand All @@ -43,7 +43,7 @@ jobs:
matrix: ${{fromJson(needs.get-matrix.outputs.matrix)}}

image_and_iso_arm64_generic:
uses: kairos-io/kairos/.github/workflows/reusable-image-and-iso-arm-generic.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-image-and-iso-arm-generic.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/image-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,68 +11,68 @@ env:
FORCE_COLOR: 1
jobs:
core:
uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@master
with:
flavor: ubuntu

install:
uses: kairos-io/kairos/.github/workflows/reusable-install-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-install-test.yaml@master
with:
flavor: ubuntu
needs:
- core

zfs:
uses: kairos-io/kairos/.github/workflows/reusable-zfs-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-zfs-test.yaml@master
with:
flavor: ubuntu
needs:
- core

acceptance:
uses: kairos-io/kairos/.github/workflows/reusable-qemu-acceptance-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-qemu-acceptance-test.yaml@master
with:
flavor: ubuntu
needs:
- core

bundles:
uses: kairos-io/kairos/.github/workflows/reusable-qemu-bundles-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-qemu-bundles-test.yaml@master
with:
flavor: ubuntu
needs:
- core

reset:
uses: kairos-io/kairos/.github/workflows/reusable-qemu-reset-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-qemu-reset-test.yaml@master
with:
flavor: ubuntu
needs:
- core

netboot:
uses: kairos-io/kairos/.github/workflows/reusable-qemu-netboot-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-qemu-netboot-test.yaml@master
with:
flavor: ubuntu
needs:
- core

upgrade:
uses: kairos-io/kairos/.github/workflows/reusable-upgrade-with-cli-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-upgrade-with-cli-test.yaml@master
with:
flavor: ubuntu
needs:
- core

upgrade-latest:
uses: kairos-io/kairos/.github/workflows/reusable-upgrade-latest-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-upgrade-latest-test.yaml@master
with:
flavor: ubuntu
needs:
- core

encryption:
uses: kairos-io/kairos/.github/workflows/reusable-encryption-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-encryption-test.yaml@master
with:
flavor: ubuntu
label: ${{ matrix.label }}
Expand Down
28 changes: 14 additions & 14 deletions .github/workflows/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
echo "::set-output name=matrix::{\"include\": $content }"
core:
uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-build-flavor.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -65,7 +65,7 @@ jobs:


framework:
uses: kairos-io/kairos/.github/workflows/reusable-build-framework-flavor.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-build-framework-flavor.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -75,7 +75,7 @@ jobs:
matrix: ${{fromJson(needs.get-framework-matrix.outputs.matrix)}}

install:
uses: kairos-io/kairos/.github/workflows/reusable-install-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-install-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -87,7 +87,7 @@ jobs:
- flavor: opensuse-leap

zfs:
uses: kairos-io/kairos/.github/workflows/reusable-zfs-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-zfs-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -99,7 +99,7 @@ jobs:
- flavor: "ubuntu"

acceptance:
uses: kairos-io/kairos/.github/workflows/reusable-qemu-acceptance-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-qemu-acceptance-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -117,7 +117,7 @@ jobs:
- flavor: "ubuntu-22-lts"

bundles:
uses: kairos-io/kairos/.github/workflows/reusable-qemu-bundles-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-qemu-bundles-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -129,7 +129,7 @@ jobs:
- flavor: opensuse-tumbleweed # Kubo test needs systemd version 252+ which atm is not available in Leap

reset:
uses: kairos-io/kairos/.github/workflows/reusable-qemu-reset-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-qemu-reset-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -142,7 +142,7 @@ jobs:
- flavor: opensuse-leap

netboot:
uses: kairos-io/kairos/.github/workflows/reusable-qemu-netboot-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-qemu-netboot-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -156,7 +156,7 @@ jobs:
- flavor: ubuntu

upgrade:
uses: kairos-io/kairos/.github/workflows/reusable-upgrade-with-cli-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-upgrade-with-cli-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -169,7 +169,7 @@ jobs:
- flavor: opensuse-leap

upgrade-latest:
uses: kairos-io/kairos/.github/workflows/reusable-upgrade-latest-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-upgrade-latest-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand All @@ -185,7 +185,7 @@ jobs:
# - flavor: "ubuntu"

encryption:
uses: kairos-io/kairos/.github/workflows/reusable-encryption-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-encryption-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
label: ${{ matrix.label }}
Expand All @@ -204,7 +204,7 @@ jobs:
- "opensuse-leap"

standard:
uses: kairos-io/kairos/.github/workflows/reusable-build-provider.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-build-provider.yaml@master
with:
flavor: ${{ matrix.flavor }}
strategy:
Expand All @@ -214,7 +214,7 @@ jobs:
- "opensuse-leap"
- "alpine-opensuse-leap"
various:
uses: kairos-io/kairos/.github/workflows/reusable-provider-tests.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-provider-tests.yaml@master
with:
flavor: ${{ matrix.flavor }}
label: ${{ matrix.label }}
Expand All @@ -238,7 +238,7 @@ jobs:
- label: "provider-upgrade"
flavor: "alpine-opensuse-leap"
standard-upgrade-latest:
uses: kairos-io/kairos/.github/workflows/reusable-provider-upgrade-latest-test.yaml@1556-pr-one-flavor-pt2
uses: kairos-io/kairos/.github/workflows/reusable-provider-upgrade-latest-test.yaml@master
with:
flavor: ${{ matrix.flavor }}
needs:
Expand Down

0 comments on commit 49c9273

Please sign in to comment.