Skip to content

Commit c17ab5e

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

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:
@@ -182,8 +182,8 @@ jobs:
182182
path: |
183183
~/.cache/go-build
184184
~/go/pkg/mod
185-
key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-x86-${{ hashFiles('**/go.sum') }}
186-
restore-keys: ${{ runner.os }}-go-${{ env.GO_VERSION }}-x86-
185+
key: ${{ runner.os }}-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles('**/go.sum') }}
186+
restore-keys: ${{ runner.os }}-go-${{ env.GO_VERSION }}-amd64-
187187

188188
- name: Unit test
189189
run: |
@@ -402,8 +402,8 @@ jobs:
402402
path: |
403403
~/.cache/go-build
404404
~/go/pkg/mod
405-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
406-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
405+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
406+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
407407
lookup-only: true
408408

409409
- uses: jlumbroso/free-disk-space@v1.3.1
@@ -424,8 +424,8 @@ jobs:
424424
path: |
425425
~/.cache/go-build
426426
~/go/pkg/mod
427-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
428-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
427+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
428+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
429429

430430
- name: Install ginkgo
431431
if: steps.lookup-go-cache.outputs.cache-hit != 'true'
@@ -542,8 +542,8 @@ jobs:
542542
path: |
543543
~/.cache/go-build
544544
~/go/pkg/mod
545-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
546-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
545+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
546+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
547547

548548
- name: Install kind
549549
uses: helm/kind-action@v1.12.0
@@ -738,8 +738,8 @@ jobs:
738738
path: |
739739
~/.cache/go-build
740740
~/go/pkg/mod
741-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
742-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
741+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
742+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
743743

744744
- name: Install kind
745745
uses: helm/kind-action@v1.12.0
@@ -1091,8 +1091,8 @@ jobs:
10911091
path: |
10921092
~/.cache/go-build
10931093
~/go/pkg/mod
1094-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1095-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1094+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1095+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
10961096

10971097
- name: Install kind
10981098
uses: helm/kind-action@v1.12.0
@@ -1284,8 +1284,8 @@ jobs:
12841284
path: |
12851285
~/.cache/go-build
12861286
~/go/pkg/mod
1287-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1288-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1287+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1288+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
12891289

12901290
- name: Install kind
12911291
uses: helm/kind-action@v1.12.0
@@ -1441,8 +1441,8 @@ jobs:
14411441
path: |
14421442
~/.cache/go-build
14431443
~/go/pkg/mod
1444-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1445-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1444+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1445+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
14461446

14471447
- name: Install kind
14481448
uses: helm/kind-action@v1.12.0
@@ -1533,7 +1533,7 @@ jobs:
15331533
fail-fast: false
15341534
matrix:
15351535
ssl:
1536-
- "true"
1536+
# - "true"
15371537
- "false"
15381538
timeout-minutes: 30
15391539
steps:
@@ -1786,8 +1786,8 @@ jobs:
17861786
path: |
17871787
~/.cache/go-build
17881788
~/go/pkg/mod
1789-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1790-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1789+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1790+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
17911791

17921792
- name: Install kind
17931793
uses: helm/kind-action@v1.12.0
@@ -1929,8 +1929,8 @@ jobs:
19291929
path: |
19301930
~/.cache/go-build
19311931
~/go/pkg/mod
1932-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1933-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
1932+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
1933+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
19341934

19351935
- name: Install kind
19361936
uses: helm/kind-action@v1.12.0
@@ -2198,8 +2198,8 @@ jobs:
21982198
path: |
21992199
~/.cache/go-build
22002200
~/go/pkg/mod
2201-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2202-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2201+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2202+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
22032203

22042204
- name: Install kind
22052205
uses: helm/kind-action@v1.12.0
@@ -2295,7 +2295,7 @@ jobs:
22952295
fail-fast: false
22962296
matrix:
22972297
ssl:
2298-
- "true"
2298+
# - "true"
22992299
- "false"
23002300
bind-local:
23012301
- "true"
@@ -2353,8 +2353,8 @@ jobs:
23532353
path: |
23542354
~/.cache/go-build
23552355
~/go/pkg/mod
2356-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2357-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2356+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2357+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
23582358

23592359
- name: Install kind
23602360
uses: helm/kind-action@v1.12.0
@@ -2573,8 +2573,8 @@ jobs:
25732573
path: |
25742574
~/.cache/go-build
25752575
~/go/pkg/mod
2576-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2577-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2576+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2577+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
25782578

25792579
- name: Install kind
25802580
uses: helm/kind-action@v1.12.0
@@ -2747,8 +2747,8 @@ jobs:
27472747
path: |
27482748
~/.cache/go-build
27492749
~/go/pkg/mod
2750-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2751-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2750+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2751+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
27522752

27532753
- name: Install kind
27542754
uses: helm/kind-action@v1.12.0
@@ -2890,8 +2890,8 @@ jobs:
28902890
path: |
28912891
~/.cache/go-build
28922892
~/go/pkg/mod
2893-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2894-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
2893+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
2894+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
28952895

28962896
- name: Install kind
28972897
uses: helm/kind-action@v1.12.0
@@ -3033,8 +3033,8 @@ jobs:
30333033
path: |
30343034
~/.cache/go-build
30353035
~/go/pkg/mod
3036-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3037-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
3036+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3037+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
30383038

30393039
- name: Install kind
30403040
uses: helm/kind-action@v1.12.0
@@ -3175,8 +3175,8 @@ jobs:
31753175
path: |
31763176
~/.cache/go-build
31773177
~/go/pkg/mod
3178-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3179-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
3178+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3179+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
31803180

31813181
- name: Install kind
31823182
uses: helm/kind-action@v1.12.0
@@ -3282,8 +3282,8 @@ jobs:
32823282
path: |
32833283
~/.cache/go-build
32843284
~/go/pkg/mod
3285-
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3286-
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-x86-
3285+
key: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-${{ hashFiles(format('{0}/**/go.sum', env.E2E_DIR)) }}
3286+
restore-keys: ${{ runner.os }}-e2e-go-${{ env.GO_VERSION }}-amd64-
32873287

32883288
- name: Install kind
32893289
uses: helm/kind-action@v1.12.0
@@ -3409,6 +3409,9 @@ jobs:
34093409
swap-storage: false
34103410

34113411
- uses: actions/checkout@v4
3412+
id: checkout
3413+
with:
3414+
ref: ${{ github.head_ref || github.ref }}
34123415

34133416
- name: Download kube-ovn image
34143417
uses: actions/download-artifact@v4
@@ -3446,26 +3449,18 @@ jobs:
34463449
make scan
34473450
34483451
- name: Push
3449-
if: github.ref_name == github.event.repository.default_branch || startsWith(github.ref_name, 'release-')
34503452
env:
34513453
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
34523454
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
3453-
COMMIT: ${{ github.sha }}
3455+
COMMIT: ${{ steps.checkout.outputs.commit }}
34543456
run: |
3455-
cat VERSION
34563457
TAG=$(cat VERSION)
3458+
COMMIT=${COMMIT:0:9}
34573459
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
3458-
docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn-dev:$COMMIT-x86
3459-
docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn:$TAG-x86
3460-
docker tag kubeovn/kube-ovn:$TAG-debug kubeovn/kube-ovn:$TAG-debug-x86
3461-
docker tag kubeovn/kube-ovn:$TAG-dpdk kubeovn/kube-ovn:$TAG-dpdk-x86
3462-
docker tag kubeovn/vpc-nat-gateway:$TAG kubeovn/vpc-nat-gateway-dev:$COMMIT-x86
3463-
docker tag kubeovn/vpc-nat-gateway:$TAG kubeovn/vpc-nat-gateway:$TAG-x86
3460+
docker tag kubeovn/kube-ovn:$TAG kubeovn/kube-ovn:$TAG-$COMMIT-amd64
3461+
docker tag kubeovn/kube-ovn:$TAG-debug kubeovn/kube-ovn:$TAG-$COMMIT-debug-amd64
3462+
docker tag kubeovn/vpc-nat-gateway:$TAG kubeovn/vpc-nat-gateway:$TAG-$COMMIT-amd64
34643463
docker images
3465-
docker push kubeovn/kube-ovn:$TAG-x86
3466-
docker push kubeovn/kube-ovn:$TAG-amd64-legacy
3467-
docker push kubeovn/kube-ovn-dev:$COMMIT-x86
3468-
docker push kubeovn/kube-ovn:$TAG-debug-x86
3469-
docker push kubeovn/kube-ovn:$TAG-dpdk-x86
3470-
docker push kubeovn/vpc-nat-gateway:$TAG-x86
3471-
docker push kubeovn/vpc-nat-gateway-dev:$COMMIT-x86
3464+
docker push kubeovn/kube-ovn:$TAG-$COMMIT-amd64
3465+
docker push kubeovn/kube-ovn:$TAG-$COMMIT-debug-amd64
3466+
docker push kubeovn/vpc-nat-gateway:$TAG-$COMMIT-amd64

0 commit comments

Comments
 (0)