Skip to content

Commit 4c984b2

Browse files
zhangzujianzhangzujian
committed
update ci
Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
1 parent 8f3ea84 commit 4c984b2

File tree

9 files changed

+223
-128
lines changed

9 files changed

+223
-128
lines changed

.github/workflows/build-x86-image.yaml renamed to .github/workflows/build-amd64-image.yaml

Lines changed: 50 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build x86 Image
1+
name: Build AMD64 Image
22

33
on:
44
pull_request:
@@ -180,8 +180,8 @@ jobs:
180180
path: |
181181
~/.cache/go-build
182182
~/go/pkg/mod
183-
key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-x86-${{ hashFiles('**/go.sum') }}
184-
restore-keys: ${{ runner.os }}-go-${{ env.GO_VERSION }}-x86-
183+
key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles('**/go.sum') }}
184+
restore-keys: ${{ runner.os }}-go-${{ env.GO_VERSION }}-amd64-
185185

186186
- name: Unit test
187187
run: |
@@ -400,8 +400,8 @@ jobs:
400400
path: |
401401
~/.cache/go-build
402402
~/go/pkg/mod
403-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
404-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
403+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
404+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
405405
lookup-only: true
406406

407407
- uses: jlumbroso/free-disk-space@v1.3.1
@@ -422,8 +422,8 @@ jobs:
422422
path: |
423423
~/.cache/go-build
424424
~/go/pkg/mod
425-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
426-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
425+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
426+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
427427

428428
- name: Install ginkgo
429429
if: steps.lookup-go-cache.outputs.cache-hit != 'true'
@@ -540,8 +540,8 @@ jobs:
540540
path: |
541541
~/.cache/go-build
542542
~/go/pkg/mod
543-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
544-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
543+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
544+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
545545

546546
- name: Install kind
547547
uses: helm/kind-action@v1.12.0
@@ -736,8 +736,8 @@ jobs:
736736
path: |
737737
~/.cache/go-build
738738
~/go/pkg/mod
739-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
740-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
739+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
740+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
741741

742742
- name: Install kind
743743
uses: helm/kind-action@v1.12.0
@@ -1089,8 +1089,8 @@ jobs:
10891089
path: |
10901090
~/.cache/go-build
10911091
~/go/pkg/mod
1092-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1093-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1092+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1093+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
10941094

10951095
- name: Install kind
10961096
uses: helm/kind-action@v1.12.0
@@ -1282,8 +1282,8 @@ jobs:
12821282
path: |
12831283
~/.cache/go-build
12841284
~/go/pkg/mod
1285-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1286-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1285+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1286+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
12871287

12881288
- name: Install kind
12891289
uses: helm/kind-action@v1.12.0
@@ -1439,8 +1439,8 @@ jobs:
14391439
path: |
14401440
~/.cache/go-build
14411441
~/go/pkg/mod
1442-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1443-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1442+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1443+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
14441444

14451445
- name: Install kind
14461446
uses: helm/kind-action@v1.12.0
@@ -1531,7 +1531,7 @@ jobs:
15311531
fail-fast: false
15321532
matrix:
15331533
ssl:
1534-
- "true"
1534+
# - "true"
15351535
- "false"
15361536
timeout-minutes: 30
15371537
steps:
@@ -1784,8 +1784,8 @@ jobs:
17841784
path: |
17851785
~/.cache/go-build
17861786
~/go/pkg/mod
1787-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1788-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1787+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1788+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
17891789

17901790
- name: Install kind
17911791
uses: helm/kind-action@v1.12.0
@@ -1927,8 +1927,8 @@ jobs:
19271927
path: |
19281928
~/.cache/go-build
19291929
~/go/pkg/mod
1930-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1931-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1930+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1931+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
19321932

19331933
- name: Install kind
19341934
uses: helm/kind-action@v1.12.0
@@ -2196,8 +2196,8 @@ jobs:
21962196
path: |
21972197
~/.cache/go-build
21982198
~/go/pkg/mod
2199-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2200-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2199+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2200+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
22012201

22022202
- name: Install kind
22032203
uses: helm/kind-action@v1.12.0
@@ -2293,7 +2293,7 @@ jobs:
22932293
fail-fast: false
22942294
matrix:
22952295
ssl:
2296-
- "true"
2296+
# - "true"
22972297
- "false"
22982298
bind-local:
22992299
- "true"
@@ -2351,8 +2351,8 @@ jobs:
23512351
path: |
23522352
~/.cache/go-build
23532353
~/go/pkg/mod
2354-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2355-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2354+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2355+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
23562356

23572357
- name: Install kind
23582358
uses: helm/kind-action@v1.12.0
@@ -2571,8 +2571,8 @@ jobs:
25712571
path: |
25722572
~/.cache/go-build
25732573
~/go/pkg/mod
2574-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2575-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2574+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2575+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
25762576

25772577
- name: Install kind
25782578
uses: helm/kind-action@v1.12.0
@@ -2745,8 +2745,8 @@ jobs:
27452745
path: |
27462746
~/.cache/go-build
27472747
~/go/pkg/mod
2748-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2749-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2748+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2749+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
27502750

27512751
- name: Install kind
27522752
uses: helm/kind-action@v1.12.0
@@ -2888,8 +2888,8 @@ jobs:
28882888
path: |
28892889
~/.cache/go-build
28902890
~/go/pkg/mod
2891-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2892-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2891+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2892+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
28932893

28942894
- name: Install kind
28952895
uses: helm/kind-action@v1.12.0
@@ -3031,8 +3031,8 @@ jobs:
30313031
path: |
30323032
~/.cache/go-build
30333033
~/go/pkg/mod
3034-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3035-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
3034+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3035+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
30363036

30373037
- name: Install kind
30383038
uses: helm/kind-action@v1.12.0
@@ -3173,8 +3173,8 @@ jobs:
31733173
path: |
31743174
~/.cache/go-build
31753175
~/go/pkg/mod
3176-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3177-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
3176+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3177+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
31783178

31793179
- name: Install kind
31803180
uses: helm/kind-action@v1.12.0
@@ -3280,8 +3280,8 @@ jobs:
32803280
path: |
32813281
~/.cache/go-build
32823282
~/go/pkg/mod
3283-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3284-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
3283+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3284+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
32853285

32863286
- name: Install kind
32873287
uses: helm/kind-action@v1.12.0
@@ -3407,6 +3407,9 @@ jobs:
34073407
swap-storage: false
34083408

34093409
- uses: actions/checkout@v4
3410+
id: checkout
3411+
with:
3412+
ref: ${{ github.head_ref || github.ref }}
34103413

34113414
- name: Download kube-ovn image
34123415
uses: actions/download-artifact@v4
@@ -3444,26 +3447,18 @@ jobs:
34443447
make scan
34453448
34463449
- name: Push
3447-
if: github.ref_name == github.event.repository.default_branch || startsWith(github.ref_name, 'release-')
34483450
env:
34493451
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
34503452
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
3451-
COMMIT: ${{ github.sha }}
3453+
COMMIT: ${{ steps.checkout.outputs.commit }}
34523454
run: |
3453-
cat VERSION
34543455
TAG=$(cat VERSION)
3456+
COMMIT=${COMMIT:0:9}
34553457
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
3456-
docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn-dev:$COMMIT-x86
3457-
docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn:$TAG-x86
3458-
docker tag kubeovn/kube-ovn:$TAG-debug kubeovn/kube-ovn:$TAG-debug-x86
3459-
docker tag kubeovn/kube-ovn:$TAG-dpdk kubeovn/kube-ovn:$TAG-dpdk-x86
3460-
docker tag kubeovn/vpc-nat-gateway:$TAG kubeovn/vpc-nat-gateway-dev:$COMMIT-x86
3461-
docker tag kubeovn/vpc-nat-gateway:$TAG kubeovn/vpc-nat-gateway:$TAG-x86
3458+
docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn:$TAG-$COMMIT-amd64
3459+
docker tag kubeovn/kube-ovn:$TAG-debug kubeovn/kube-ovn:$TAG-$COMMIT-debug-amd64
3460+
docker tag kubeovn/vpc-nat-gateway:$TAG kubeovn/vpc-nat-gateway:$TAG-$COMMIT-amd64
34623461
docker images
3463-
docker push kubeovn/kube-ovn:$TAG-x86
3464-
docker push kubeovn/kube-ovn:$TAG-amd64-legacy
3465-
docker push kubeovn/kube-ovn-dev:$COMMIT-x86
3466-
docker push kubeovn/kube-ovn:$TAG-debug-x86
3467-
docker push kubeovn/kube-ovn:$TAG-dpdk-x86
3468-
docker push kubeovn/vpc-nat-gateway:$TAG-x86
3469-
docker push kubeovn/vpc-nat-gateway-dev:$COMMIT-x86
3462+
docker push kubeovn/kube-ovn:$TAG-$COMMIT-amd64
3463+
docker push kubeovn/kube-ovn:$TAG-$COMMIT-debug-amd64
3464+
docker push kubeovn/vpc-nat-gateway:$TAG-$COMMIT-amd64

0 commit comments

Comments
 (0)