Skip to content

Commit 0dc926a

Browse files
furykerryfurykerry
committed
Create codeql.yml and fix e2e
Signed-off-by: 守辰 <[email protected]>
1 parent f8994e7 commit 0dc926a

File tree

5 files changed

+181
-4
lines changed

5 files changed

+181
-4
lines changed

‎.github/codeql/codeql-config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
paths-ignore:
2+
- vendor

‎.github/workflows/codeql.yml

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ "master", "release-*" ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ "master" ]
20+
21+
22+
jobs:
23+
analyze:
24+
name: Analyze
25+
# Runner size impacts CodeQL analysis time. To learn more, please see:
26+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
27+
# - https://gh.io/supported-runners-and-hardware-resources
28+
# - https://gh.io/using-larger-runners
29+
# Consider using larger runners for possible analysis time improvements.
30+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
31+
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
32+
permissions:
33+
actions: read
34+
contents: read
35+
security-events: write
36+
37+
strategy:
38+
fail-fast: false
39+
matrix:
40+
language: [ 'go' ]
41+
# CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
42+
# Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
43+
# Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
44+
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
45+
46+
steps:
47+
- name: Checkout repository
48+
uses: actions/checkout@v3
49+
50+
# Initializes the CodeQL tools for scanning.
51+
- name: Initialize CodeQL
52+
uses: github/codeql-action/init@v2
53+
with:
54+
languages: ${{ matrix.language }}
55+
config-file: ./.github/codeql/codeql-config.yml
56+
# If you wish to specify custom queries, you can do so here or in a config file.
57+
# By default, queries listed here will override any specified in a config file.
58+
# Prefix the list here with "+" to use these queries and those in the config file.
59+
60+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
61+
# queries: security-extended,security-and-quality
62+
63+
64+
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
65+
# If this step fails, then you should remove it and run the build manually (see below)
66+
- name: Autobuild
67+
uses: github/codeql-action/autobuild@v2
68+
69+
# ℹ️ Command-line programs to run using the OS shell.
70+
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
71+
72+
# If the Autobuild fails above, remove it and uncomment the following three lines.
73+
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
74+
75+
# - run: |
76+
# echo "Run, Build Application using script"
77+
# ./location_of_script_within_repo/buildscript.sh
78+
79+
- name: Perform CodeQL Analysis
80+
uses: github/codeql-action/analyze@v2
81+
with:
82+
category: "/language:${{matrix.language}}"

‎.github/workflows/e2e-1.16.yaml

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ jobs:
9797
exit 1
9898
fi
9999
done
100+
if [ "$retVal" -ne 0 ];then
101+
echo "test fail, dump kruise-manager logs"
102+
while read pod; do
103+
kubectl logs -n kruise-system $pod
104+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
105+
fi
100106
exit $retVal
101107
102108
pullimages-containerrecreate:
@@ -178,6 +184,12 @@ jobs:
178184
exit 1
179185
fi
180186
done
187+
if [ "$retVal" -ne 0 ];then
188+
echo "test fail, dump kruise-manager logs"
189+
while read pod; do
190+
kubectl logs -n kruise-system $pod
191+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
192+
fi
181193
exit $retVal
182194
183195
advanced-daemonset:
@@ -259,6 +271,12 @@ jobs:
259271
exit 1
260272
fi
261273
done
274+
if [ "$retVal" -ne 0 ];then
275+
echo "test fail, dump kruise-manager logs"
276+
while read pod; do
277+
kubectl logs -n kruise-system $pod
278+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
279+
fi
262280
exit $retVal
263281
264282
sidecarset:
@@ -340,6 +358,12 @@ jobs:
340358
exit 1
341359
fi
342360
done
361+
if [ "$retVal" -ne 0 ];then
362+
echo "test fail, dump kruise-manager logs"
363+
while read pod; do
364+
kubectl logs -n kruise-system $pod
365+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
366+
fi
343367
exit $retVal
344368
345369
podUnavailableBudget:
@@ -399,7 +423,14 @@ jobs:
399423
make ginkgo
400424
set +e
401425
./bin/ginkgo -timeout 60m -v --focus='\[policy\] PodUnavailableBudget' test/e2e
402-
426+
retVal=$?
427+
if [ "$retVal" -ne 0 ];then
428+
echo "test fail, dump kruise-manager logs"
429+
while read pod; do
430+
kubectl logs -n kruise-system $pod
431+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
432+
fi
433+
exit $retVal
403434
other:
404435
runs-on: ubuntu-20.04
405436
steps:
@@ -479,4 +510,10 @@ jobs:
479510
exit 1
480511
fi
481512
done
513+
if [ "$retVal" -ne 0 ];then
514+
echo "test fail, dump kruise-manager logs"
515+
while read pod; do
516+
kubectl logs -n kruise-system $pod
517+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
518+
fi
482519
exit $retVal

‎.github/workflows/e2e-1.20-EphemeralJob.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,11 @@ jobs:
9696
exit 1
9797
fi
9898
done
99+
100+
if [ "$retVal" -ne 0 ];then
101+
echo "test fail, dump kruise-manager logs"
102+
while read pod; do
103+
kubectl logs -n kruise-system $pod
104+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
105+
fi
99106
exit $retVal

‎.github/workflows/e2e-1.26.yaml renamed to ‎.github/workflows/e2e-1.24.yaml

Lines changed: 52 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: E2E-1.26
1+
name: E2E-1.24
22

33
on:
44
push:
@@ -13,7 +13,7 @@ env:
1313
GO_VERSION: '1.19'
1414
KIND_ACTION_VERSION: 'v1.3.0'
1515
KIND_VERSION: 'v0.14.0'
16-
KIND_IMAGE: 'kindest/node:v1.26.4'
16+
KIND_IMAGE: 'kindest/node:v1.24.6'
1717
KIND_CLUSTER_NAME: 'ci-testing'
1818

1919
jobs:
@@ -85,6 +85,12 @@ jobs:
8585
kubectl get pod -n kruise-system --no-headers -l control-plane=controller-manager | awk '{print $1}' | xargs kubectl logs -p -n kruise-system
8686
exit 1
8787
fi
88+
if [ "$retVal" -ne 0 ];then
89+
echo "test fail, dump kruise-manager logs"
90+
while read pod; do
91+
kubectl logs -n kruise-system $pod
92+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
93+
fi
8894
exit $retVal
8995
9096
pullimages-containerrecreate:
@@ -166,6 +172,13 @@ jobs:
166172
exit 1
167173
fi
168174
done
175+
if [ "$retVal" -ne 0 ];then
176+
echo "test fail, dump kruise-manager logs"
177+
while read pod; do
178+
kubectl logs -n kruise-system $pod
179+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
180+
fi
181+
169182
exit $retVal
170183
171184
advanced-daemonset:
@@ -247,6 +260,13 @@ jobs:
247260
exit 1
248261
fi
249262
done
263+
264+
if [ "$retVal" -ne 0 ];then
265+
echo "test fail, dump kruise-manager logs"
266+
while read pod; do
267+
kubectl logs -n kruise-system $pod
268+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
269+
fi
250270
exit $retVal
251271
252272
sidecarset:
@@ -328,6 +348,13 @@ jobs:
328348
exit 1
329349
fi
330350
done
351+
352+
if [ "$retVal" -ne 0 ];then
353+
echo "test fail, dump kruise-manager logs"
354+
while read pod; do
355+
kubectl logs -n kruise-system $pod
356+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
357+
fi
331358
exit $retVal
332359
333360
ephemeraljob:
@@ -387,6 +414,14 @@ jobs:
387414
make ginkgo
388415
set +e
389416
./bin/ginkgo -timeout 60m -v --focus='\[apps\] EphemeralJob' test/e2e
417+
retVal=$?
418+
if [ "$retVal" -ne 0 ];then
419+
echo "test fail, dump kruise-manager logs"
420+
while read pod; do
421+
kubectl logs -n kruise-system $pod
422+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
423+
fi
424+
exit $retVal
390425
391426
podUnavailableBudget:
392427
runs-on: ubuntu-20.04
@@ -445,7 +480,14 @@ jobs:
445480
make ginkgo
446481
set +e
447482
./bin/ginkgo -timeout 60m -v --focus='\[policy\] PodUnavailableBudget' test/e2e
448-
483+
retVal=$?
484+
if [ "$retVal" -ne 0 ];then
485+
echo "test fail, dump kruise-manager logs"
486+
while read pod; do
487+
kubectl logs -n kruise-system $pod
488+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
489+
fi
490+
exit $retVal
449491
other:
450492
runs-on: ubuntu-20.04
451493
steps:
@@ -525,4 +567,11 @@ jobs:
525567
exit 1
526568
fi
527569
done
570+
if [ "${retVal}" -ne 0 ];then
571+
echo "test fail, dump kruise-manager logs"
572+
while read pod; do
573+
kubectl logs -n kruise-system $pod
574+
done < <(kubectl get pods -n kruise-system -l control-plane=controller-manager --no-headers | awk '{print $1}')
575+
fi
576+
528577
exit $retVal

0 commit comments

Comments
 (0)