Skip to content

Commit

Permalink
🤖 Add ubuntu to releases, cleanup workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
mudler committed Sep 21, 2022
1 parent cb7de24 commit f196636
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 104 deletions.
96 changes: 3 additions & 93 deletions .github/workflows/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ jobs:
matrix:
include:
- flavor: "opensuse"
#- flavor: "tumbleweed"
#- flavor: "fedora"
- flavor: "ubuntu"
- flavor: "alpine"
steps:
Expand Down Expand Up @@ -101,9 +99,6 @@ jobs:
include:
- flavor: "opensuse"
- flavor: "alpine"
- flavor: "ubuntu"
# - flavor: "tumbleweed"
# - flavor: "fedora"
steps:
- uses: actions/checkout@v2
- name: Install deps
Expand All @@ -129,35 +124,6 @@ jobs:
path: |
*.ova
if-no-files-found: error
# prepare-test:
# needs: build
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v2
# - run: |
# git fetch --prune --unshallow
# - name: Install Go
# uses: actions/setup-go@v2
# with:
# go-version: '^1.16'
# - name: Prepare config
# run: |
# ./earthly.sh +build-kairososososos-cli
# ./build/kairos create-config > config.yaml
# cat tests/assets/config.yaml >> config.yaml
# - name: Enable dns
# uses: mikefarah/yq@master
# with:
# cmd: yq -i '.kairos.dns = true' 'config.yaml'
# - name: Show config
# run: |
# cat config.yaml
# - uses: actions/upload-artifact@v2
# with:
# name: config.yaml
# path: |
# config.yaml
# if-no-files-found: error

install-test:
needs:
Expand All @@ -168,11 +134,6 @@ jobs:
matrix:
include:
- flavor: "opensuse"
node: "A" # Arbitrary field
#- flavor: "alpine"
# node: "B" # Arbitrary field
#- flavor: "tumbleweed"
# node: "C"
steps:
- uses: actions/checkout@v2
- name: Download artifacts
Expand Down Expand Up @@ -255,11 +216,8 @@ jobs:
matrix:
include:
- flavor: "alpine"
node: "A" # Arbitrary field
- flavor: "opensuse"
node: "B"
# - flavor: "alpine"
# node: "C"
- flavor: "ubuntu"
steps:
- uses: actions/checkout@v2
- name: Download artifacts
Expand Down Expand Up @@ -300,11 +258,8 @@ jobs:
matrix:
include:
- flavor: "alpine"
node: "A" # Arbitrary field
- flavor: "opensuse"
node: "B"
# - flavor: "alpine"
# node: "C"
- flavor: "ubuntu"
steps:
- uses: actions/checkout@v2
- name: Download artifacts
Expand Down Expand Up @@ -334,49 +289,4 @@ jobs:
name: ${{ matrix.flavor }}-upgrade-test.logs.zip
path: tests/**/logs/*
if-no-files-found: warn
# test-tumbleweed:
# needs:
# - prepare-test
# - test
# runs-on: macos-12
# strategy:
# fail-fast: true
# matrix:
# include:
# - flavor: "tumbleweed"
# node: "A" # Arbitrary field
# - flavor: "tumbleweed"
# node: "B"
# steps:
# - uses: actions/checkout@v2
# - name: Download artifacts
# uses: actions/download-artifact@v2
# with:
# name: kairos-${{ matrix.flavor }}.iso.zip
# - name: Download artifacts
# uses: actions/download-artifact@v2
# with:
# name: config.yaml
# - name: Install deps
# run: |
# brew install cdrtools jq
# - name: Install Go
# uses: actions/setup-go@v2
# with:
# go-version: '^1.16'
# - run: |
# ls -liah
# export ISO=$PWD/$(ls *.iso)
# export GOPATH="/Users/runner/go"
# PATH=$PATH:$GOPATH/bin
# go get github.com/onsi/ginkgo/v2
# go get github.com/onsi/gomega/...
# go get github.com/onsi/ginkgo/v2/ginkgo/[email protected]
# go install github.com/onsi/ginkgo/v2/ginkgo
# CLOUD_INIT=$PWD/config.yaml CREATE_VM=true FLAVOR=${{ matrix.flavor }} ginkgo --label-filter smoke --fail-fast -r ./tests/
# - uses: actions/upload-artifact@v2
# if: failure()
# with:
# name: ${{ matrix.flavor }}-vbox.logs.zip
# path: tests/**/logs/*
# if-no-files-found: warn

13 changes: 2 additions & 11 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ jobs:
matrix:
include:
- flavor: "opensuse"
# - flavor: "ubuntu"
# - flavor: "fedora"
# - flavor: "alpine"
# - flavor: "tumbleweed"
steps:
- uses: actions/checkout@v2
- run: |
Expand Down Expand Up @@ -60,10 +56,8 @@ jobs:
matrix:
include:
- flavor: "opensuse"
# - flavor: "ubuntu"
# - flavor: "fedora"
- flavor: "alpine"
# - flavor: "tumbleweed"
- flavor: "ubuntu"
steps:
- uses: actions/checkout@v2
- run: |
Expand Down Expand Up @@ -121,9 +115,6 @@ jobs:
include:
- flavor: "opensuse"
- flavor: "alpine"
# - flavor: "tumbleweed"
# - flavor: "ubuntu"
# - flavor: "fedora"
steps:
- uses: actions/checkout@v2
- name: Install deps
Expand Down Expand Up @@ -161,7 +152,7 @@ jobs:
include:
- flavor: "opensuse"
- flavor: "alpine"
# - flavor: "tumbleweed"
- flavor: "ubuntu"
steps:
- name: Download artifacts
uses: actions/download-artifact@v2
Expand Down

0 comments on commit f196636

Please sign in to comment.