From 6c7728d8baebc16a2d5552c1a93293ba60d9bc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Wed, 9 Aug 2023 09:39:45 +0800 Subject: [PATCH] fix ci --- .github/workflows/build-kube-ovn-base.yaml | 8 ++- .github/workflows/scheduled-e2e.yaml | 75 ++++++---------------- 2 files changed, 24 insertions(+), 59 deletions(-) diff --git a/.github/workflows/build-kube-ovn-base.yaml b/.github/workflows/build-kube-ovn-base.yaml index 9b5154c850a..2d17627317b 100644 --- a/.github/workflows/build-kube-ovn-base.yaml +++ b/.github/workflows/build-kube-ovn-base.yaml @@ -60,7 +60,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 @@ -100,7 +104,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 diff --git a/.github/workflows/scheduled-e2e.yaml b/.github/workflows/scheduled-e2e.yaml index 563896fe078..7b2697e1458 100644 --- a/.github/workflows/scheduled-e2e.yaml +++ b/.github/workflows/scheduled-e2e.yaml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -424,6 +424,7 @@ jobs: matrix: branch: - master + - release-1.12 - release-1.11 - release-1.10 - release-1.9 @@ -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/kind-action@v1.8.0 - 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 @@ -546,6 +499,7 @@ jobs: matrix: branch: - master + - release-1.12 - release-1.11 - release-1.10 - release-1.9 @@ -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 @@ -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 @@ -705,6 +659,7 @@ jobs: matrix: branch: - master + - release-1.12 - release-1.11 steps: - uses: actions/checkout@v3 @@ -777,6 +732,7 @@ jobs: matrix: branch: - master + - release-1.12 steps: - uses: actions/checkout@v3 @@ -847,6 +803,7 @@ jobs: matrix: branch: - master + - release-1.12 steps: - uses: actions/checkout@v3 @@ -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 @@ -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 @@ -1056,6 +1013,7 @@ jobs: matrix: branch: - master + - release-1.12 - release-1.11 - release-1.10 - release-1.9 @@ -1254,6 +1212,7 @@ jobs: matrix: branch: - master + - release-1.12 steps: - uses: actions/checkout@v3 @@ -1311,6 +1270,7 @@ jobs: matrix: branch: - master + - release-1.12 steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 @@ -1380,6 +1340,7 @@ jobs: matrix: branch: - master + - release-1.12 steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4