Skip to content

Commit 5f0638c

Browse files
zhangzujianzhangzujian
committed
update ci
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 9e4ee0e commit 5f0638c

File tree

4 files changed

+54
-140
lines changed

4 files changed

+54
-140
lines changed

‎.github/workflows/build-x86-image.yaml‎

Lines changed: 1 addition & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -190,9 +190,7 @@ jobs:
190190
${{ runner.os }}-go-${{ env.GO_VERSION }}-x86-${{ github.base_ref }}-
191191
192192
- name: Unit test
193-
run: |
194-
go install -mod=mod github.com/onsi/ginkgo/v2/ginkgo
195-
make ut
193+
run: make ut
196194

197195
- uses: shogo82148/actions-goveralls@v1
198196
continue-on-error: true
@@ -436,11 +434,6 @@ jobs:
436434
${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ github.ref_name }}-
437435
${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ github.base_ref }}-
438436
439-
- name: Install ginkgo
440-
if: steps.lookup-go-cache.outputs.cache-hit != 'true'
441-
working-directory: ${{ env.E2E_DIR }}
442-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
443-
444437
- run: make e2e-build
445438
if: steps.lookup-go-cache.outputs.cache-hit != 'true'
446439
working-directory: ${{ env.E2E_DIR }}
@@ -562,10 +555,6 @@ jobs:
562555
version: ${{ env.KIND_VERSION }}
563556
install_only: true
564557

565-
- name: Install ginkgo
566-
working-directory: ${{ env.E2E_DIR }}
567-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
568-
569558
- name: Download image
570559
uses: actions/download-artifact@v7
571560
with:
@@ -767,10 +756,6 @@ jobs:
767756
version: ${{ env.KIND_VERSION }}
768757
install_only: true
769758

770-
- name: Install ginkgo
771-
working-directory: ${{ env.E2E_DIR }}
772-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
773-
774759
- name: Download image
775760
uses: actions/download-artifact@v7
776761
with:
@@ -939,10 +924,6 @@ jobs:
939924
version: ${{ env.KIND_VERSION }}
940925
install_only: true
941926

942-
- name: Install ginkgo
943-
working-directory: ${{ env.E2E_DIR }}
944-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
945-
946927
- name: Download image
947928
uses: actions/download-artifact@v7
948929
with:
@@ -1131,10 +1112,6 @@ jobs:
11311112
version: ${{ env.KIND_VERSION }}
11321113
install_only: true
11331114

1134-
- name: Install ginkgo
1135-
working-directory: ${{ env.E2E_DIR }}
1136-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
1137-
11381115
- name: Download image
11391116
uses: actions/download-artifact@v7
11401117
with:
@@ -1328,10 +1305,6 @@ jobs:
13281305
version: ${{ env.KIND_VERSION }}
13291306
install_only: true
13301307

1331-
- name: Install ginkgo
1332-
working-directory: ${{ env.E2E_DIR }}
1333-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
1334-
13351308
- name: Download image
13361309
uses: actions/download-artifact@v7
13371310
with:
@@ -1489,10 +1462,6 @@ jobs:
14891462
version: ${{ env.KIND_VERSION }}
14901463
install_only: true
14911464

1492-
- name: Install ginkgo
1493-
working-directory: ${{ env.E2E_DIR }}
1494-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
1495-
14961465
- name: Download kube-ovn image
14971466
uses: actions/download-artifact@v7
14981467
with:
@@ -1641,10 +1610,6 @@ jobs:
16411610
version: ${{ env.KIND_VERSION }}
16421611
install_only: true
16431612

1644-
- name: Install ginkgo
1645-
working-directory: ${{ env.E2E_DIR }}
1646-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
1647-
16481613
- name: Download image
16491614
uses: actions/download-artifact@v7
16501615
with:
@@ -2008,10 +1973,6 @@ jobs:
20081973
version: ${{ env.KIND_VERSION }}
20091974
install_only: true
20101975

2011-
- name: Install ginkgo
2012-
working-directory: ${{ env.E2E_DIR }}
2013-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2014-
20151976
- name: Download kube-ovn image
20161977
uses: actions/download-artifact@v7
20171978
with:
@@ -2155,10 +2116,6 @@ jobs:
21552116
version: ${{ env.KIND_VERSION }}
21562117
install_only: true
21572118

2158-
- name: Install ginkgo
2159-
working-directory: ${{ env.E2E_DIR }}
2160-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2161-
21622119
- name: Download kube-ovn image
21632120
uses: actions/download-artifact@v7
21642121
with:
@@ -2416,10 +2373,6 @@ jobs:
24162373
version: ${{ env.KIND_VERSION }}
24172374
install_only: true
24182375

2419-
- name: Install ginkgo
2420-
working-directory: ${{ env.E2E_DIR }}
2421-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2422-
24232376
- name: Download image
24242377
uses: actions/download-artifact@v7
24252378
with:
@@ -2554,10 +2507,6 @@ jobs:
25542507
version: ${{ env.KIND_VERSION }}
25552508
install_only: true
25562509

2557-
- name: Install ginkgo
2558-
working-directory: ${{ env.E2E_DIR }}
2559-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2560-
25612510
- name: Download image
25622511
uses: actions/download-artifact@v7
25632512
with:
@@ -2709,10 +2658,6 @@ jobs:
27092658
version: ${{ env.KIND_VERSION }}
27102659
install_only: true
27112660

2712-
- name: Install ginkgo
2713-
working-directory: ${{ env.E2E_DIR }}
2714-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2715-
27162661
- name: Download image
27172662
uses: actions/download-artifact@v7
27182663
with:
@@ -2868,10 +2813,6 @@ jobs:
28682813
version: ${{ env.KIND_VERSION }}
28692814
install_only: true
28702815

2871-
- name: Install ginkgo
2872-
working-directory: ${{ env.E2E_DIR }}
2873-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
2874-
28752816
- name: Download image
28762817
uses: actions/download-artifact@v7
28772818
with:
@@ -3094,10 +3035,6 @@ jobs:
30943035
version: ${{ env.KIND_VERSION }}
30953036
install_only: true
30963037

3097-
- name: Install ginkgo
3098-
working-directory: ${{ env.E2E_DIR }}
3099-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3100-
31013038
- name: Download image
31023039
uses: actions/download-artifact@v7
31033040
with:
@@ -3274,10 +3211,6 @@ jobs:
32743211
version: ${{ env.KIND_VERSION }}
32753212
install_only: true
32763213

3277-
- name: Install ginkgo
3278-
working-directory: ${{ env.E2E_DIR }}
3279-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3280-
32813214
- name: Download kube-ovn image
32823215
uses: actions/download-artifact@v7
32833216
with:
@@ -3421,10 +3354,6 @@ jobs:
34213354
version: ${{ env.KIND_VERSION }}
34223355
install_only: true
34233356

3424-
- name: Install ginkgo
3425-
working-directory: ${{ env.E2E_DIR }}
3426-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3427-
34283357
- name: Download kube-ovn image
34293358
uses: actions/download-artifact@v7
34303359
with:
@@ -3568,10 +3497,6 @@ jobs:
35683497
version: ${{ env.KIND_VERSION }}
35693498
install_only: true
35703499

3571-
- name: Install ginkgo
3572-
working-directory: ${{ env.E2E_DIR }}
3573-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3574-
35753500
- name: Download kube-ovn image
35763501
uses: actions/download-artifact@v7
35773502
with:
@@ -3710,10 +3635,6 @@ jobs:
37103635
version: ${{ env.KIND_VERSION }}
37113636
install_only: true
37123637

3713-
- name: Install ginkgo
3714-
working-directory: ${{ env.E2E_DIR }}
3715-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3716-
37173638
- name: Download kube-ovn image
37183639
uses: actions/download-artifact@v7
37193640
with:
@@ -3856,10 +3777,6 @@ jobs:
38563777
version: ${{ env.KIND_VERSION }}
38573778
install_only: true
38583779

3859-
- name: Install ginkgo
3860-
working-directory: ${{ env.E2E_DIR }}
3861-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3862-
38633780
- name: Download kube-ovn image
38643781
uses: actions/download-artifact@v7
38653782
with:
@@ -3974,10 +3891,6 @@ jobs:
39743891
version: ${{ env.KIND_VERSION }}
39753892
install_only: true
39763893

3977-
- name: Install ginkgo
3978-
working-directory: ${{ env.E2E_DIR }}
3979-
run: go install -v -mod=mod github.com/onsi/ginkgo/v2/ginkgo
3980-
39813894
- name: Download kube-ovn image
39823895
uses: actions/download-artifact@v7
39833896
with:

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ DEBUG_TAG = $(shell cat VERSION)-debug
1515
LEGACY_TAG = $(shell cat VERSION)-amd64-legacy
1616
VERSION = $(shell echo $${VERSION:-$(RELEASE_TAG)})
1717

18+
GINKGO = go tool github.com/onsi/ginkgo/v2/ginkgo
19+
1820
CONTROL_PLANE_TAINTS = node-role.kubernetes.io/master node-role.kubernetes.io/control-plane
1921

2022
FRR_VERSION = 9.1.3

0 commit comments

Comments
 (0)