Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix ci #3125

Merged
merged 2 commits into from
Aug 9, 2023
Merged

fix ci #3125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c7728d
fix ci
zhangzujian Aug 9, 2023
2bb1402
fix ci
zhangzujian Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions .github/workflows/build-kube-ovn-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: [master, release-1.11, release-1.9]
branch:
- master
- release-1.12
- release-1.11
- release-1.9
name: Build AMD64
runs-on: ubuntu-22.04
steps:
Expand All @@ -33,7 +37,11 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: [master, release-1.11, release-1.9]
branch:
- master
- release-1.12
- release-1.11
- release-1.9
name: Build ARM64
runs-on: ubuntu-22.04
steps:
Expand All @@ -60,7 +68,11 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: [master, release-1.11, release-1.9]
branch:
- master
- release-1.12
- release-1.11
- release-1.9
needs:
- build-arm64
- build-amd64
Expand Down Expand Up @@ -100,7 +112,7 @@ jobs:
docker manifest create kubeovn/kube-ovn-base:$TAG kubeovn/kube-ovn-base:$TAG-amd64 kubeovn/kube-ovn-base:$TAG-arm64
docker manifest push kubeovn/kube-ovn-base:$TAG
if [ "${{ matrix.branch }}" == "master" || "${{ matrix.branch }}" == "release-1.11" ]; then
if [ "${{ matrix.branch }}" = "master" -o "${{ matrix.branch }}" = "release-1.11" ]; then
docker push kubeovn/kube-ovn-base:$TAG-debug-amd64
docker push kubeovn/kube-ovn-base:$TAG-debug-arm64
docker manifest create kubeovn/kube-ovn-base:$TAG-debug kubeovn/kube-ovn-base:$TAG-debug-amd64 kubeovn/kube-ovn-base:$TAG-debug-arm64
Expand Down
75 changes: 18 additions & 57 deletions .github/workflows/scheduled-e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
- release-1.8
ip-family:
- ipv4
- ipv6
Expand Down Expand Up @@ -114,10 +114,10 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
- release-1.8
ip-family:
- ipv4
- ipv6
Expand Down Expand Up @@ -197,10 +197,10 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
- release-1.8
ip-family:
- ipv4
- ipv6
Expand Down Expand Up @@ -280,10 +280,10 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
- release-1.8
ip-family:
- ipv4
- ipv6
Expand Down Expand Up @@ -340,10 +340,10 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
- release-1.8
ip-family:
- ipv4
- ipv6
Expand Down Expand Up @@ -424,6 +424,7 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
Expand Down Expand Up @@ -489,54 +490,6 @@ jobs:
E2E_BRANCH: ${{ matrix.branch }}
run: make kube-ovn-ic-conformance-e2e

ha-installation-test:
name: HA Installation Test
runs-on: ubuntu-22.04
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
branch:
- release-1.8
steps:
- uses: actions/checkout@v3

- name: Create branch directory
run: mkdir -p test/e2e/kube-ovn/branches/${{ matrix.branch }}

- name: Check out branch
uses: actions/checkout@v3
with:
ref: ${{ matrix.branch }}
fetch-depth: 1
path: test/e2e/kube-ovn/branches/${{ matrix.branch }}

- name: Install kind
uses: helm/[email protected]
with:
version: v0.20.0
install_only: true

- name: Create kind cluster
working-directory: test/e2e/kube-ovn/branches/${{ matrix.branch }}
run: |
sudo pip3 install j2cli
sudo pip3 install "j2cli[yaml]"
sudo PATH=~/.local/bin:$PATH make kind-init-ha
sudo cp -r /root/.kube/ ~/.kube/
sudo chown -R $(id -un). ~/.kube/

- name: Install Kube-OVN
working-directory: test/e2e/kube-ovn/branches/${{ matrix.branch }}
run: |
version=$(grep -E '^VERSION="v([0-9]+\.){2}[0-9]+"$' dist/images/install.sh | head -n1 | awk -F= '{print $2}' | tr -d '"')
docker pull kubeovn/kube-ovn:$version
sudo ENABLE_SSL=true VERSION=$version make kind-install

- name: Cleanup
working-directory: test/e2e/kube-ovn/branches/${{ matrix.branch }}
run: sh dist/images/cleanup.sh

underlay-logical-gateway-installation-test:
name: Underlay Logical Gateway Installation Test
runs-on: ubuntu-22.04
Expand All @@ -546,6 +499,7 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
Expand Down Expand Up @@ -597,10 +551,10 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
- release-1.8
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -651,10 +605,10 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
- release-1.8
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -705,6 +659,7 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -777,6 +732,7 @@ jobs:
matrix:
branch:
- master
- release-1.12
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -847,6 +803,7 @@ jobs:
matrix:
branch:
- master
- release-1.12
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -917,10 +874,10 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
- release-1.8
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -968,10 +925,10 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
- release-1.8
steps:
- uses: actions/checkout@v3
- uses: azure/setup-helm@v3
Expand Down Expand Up @@ -1056,6 +1013,7 @@ jobs:
matrix:
branch:
- master
- release-1.12
- release-1.11
- release-1.10
- release-1.9
Expand Down Expand Up @@ -1254,6 +1212,7 @@ jobs:
matrix:
branch:
- master
- release-1.12
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -1311,6 +1270,7 @@ jobs:
matrix:
branch:
- master
- release-1.12
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
Expand Down Expand Up @@ -1380,6 +1340,7 @@ jobs:
matrix:
branch:
- master
- release-1.12
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
Expand Down
Loading