Skip to content

Commit 820df94

Browse files
committed
wip
1 parent 69d0cf3 commit 820df94

File tree

2 files changed

+0
-260
lines changed

2 files changed

+0
-260
lines changed

.circleci/continue_config.yml

Lines changed: 0 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -418,134 +418,6 @@ workflows:
418418
build-and-test:
419419
jobs:
420420
- check-ci-definition
421-
- format:
422-
name: Verify formatting
423-
requires:
424-
- check-ci-definition
425-
- shellcheck:
426-
name: run shellcheck on shell scripts
427-
requires:
428-
- check-ci-definition
429-
- build:
430-
matrix:
431-
parameters:
432-
arch:
433-
- amd64
434-
- arm64
435-
nginx-version:
436-
- 1.22.1
437-
- 1.24.0
438-
- 1.25.4
439-
- 1.27.3
440-
waf:
441-
- "ON"
442-
- "OFF"
443-
name: build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
444-
- build_openresty:
445-
matrix:
446-
parameters:
447-
arch:
448-
- amd64
449-
- arm64
450-
resty-version:
451-
- 1.27.1.1
452-
waf:
453-
- "ON"
454-
- "OFF"
455-
name: build openresty << matrix.resty-version >> on << matrix.arch >> WAF << matrix.waf >>
456-
- build_ingress_nginx_module:
457-
matrix:
458-
parameters:
459-
arch:
460-
- amd64
461-
- arm64
462-
version:
463-
- 1.12.0
464-
name: build ingress-nginx-<< matrix.version >> on << matrix.arch >>
465-
- coverage:
466-
name: Coverage on 1.27.0 with WAF ON
467-
- test:
468-
matrix:
469-
parameters:
470-
arch:
471-
- amd64
472-
- arm64
473-
base-image:
474-
- nginx:1.27.3-alpine
475-
- nginx:1.27.3
476-
nginx-version:
477-
- 1.27.3
478-
waf:
479-
- "ON"
480-
- "OFF"
481-
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
482-
requires:
483-
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
484-
- test-openresty:
485-
matrix:
486-
parameters:
487-
arch:
488-
- amd64
489-
- arm64
490-
base-image:
491-
- openresty/openresty:1.27.1.1-alpine
492-
resty-version:
493-
- 1.27.1.1
494-
waf:
495-
- "ON"
496-
- "OFF"
497-
name: test openresty << matrix.resty-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
498-
requires:
499-
- build openresty << matrix.resty-version >> on << matrix.arch >> WAF << matrix.waf >>
500-
- test:
501-
matrix:
502-
parameters:
503-
arch:
504-
- amd64
505-
- arm64
506-
base-image:
507-
- amazonlinux:2.0.20230418.0
508-
nginx-version:
509-
- 1.22.1
510-
waf:
511-
- "ON"
512-
- "OFF"
513-
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
514-
requires:
515-
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
516-
- test:
517-
matrix:
518-
parameters:
519-
arch:
520-
- amd64
521-
- arm64
522-
base-image:
523-
- amazonlinux:2023.3.20240219.0
524-
nginx-version:
525-
- 1.24.0
526-
waf:
527-
- "ON"
528-
- "OFF"
529-
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
530-
requires:
531-
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
532-
- test_ingress:
533-
matrix:
534-
parameters:
535-
arch:
536-
- amd64
537-
- arm64
538-
base-image:
539-
- registry.k8s.io/ingress-nginx/controller
540-
nginx-version:
541-
- 1.12.0
542-
name: test ingress-nginx-<< matrix.nginx-version >> on << matrix.arch >>
543-
requires:
544-
- build ingress-nginx-<< matrix.nginx-version >> on << matrix.arch >>
545-
- system_tests:
546-
name: Run system tests
547-
requires:
548-
- build 1.25.4 on amd64 WAF ON
549421
when:
550422
and:
551423
- not: << pipeline.git.tag >>

.circleci/src/workflows/build-and-test.yml

Lines changed: 0 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -4,135 +4,3 @@ when:
44
- not: << pipeline.parameters.build_all >>
55
jobs:
66
- check-ci-definition
7-
- format:
8-
name: Verify formatting
9-
requires:
10-
- check-ci-definition
11-
- shellcheck:
12-
name: run shellcheck on shell scripts
13-
requires:
14-
- check-ci-definition
15-
- build:
16-
matrix:
17-
parameters:
18-
arch:
19-
- amd64
20-
- arm64
21-
nginx-version:
22-
- 1.22.1
23-
- 1.24.0
24-
- 1.25.4
25-
- 1.27.3
26-
waf:
27-
- 'ON'
28-
- 'OFF'
29-
name: build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
30-
- build_openresty:
31-
matrix:
32-
parameters:
33-
arch:
34-
- amd64
35-
- arm64
36-
resty-version:
37-
- 1.27.1.1
38-
waf:
39-
- 'ON'
40-
- 'OFF'
41-
name: build openresty << matrix.resty-version >> on << matrix.arch >> WAF << matrix.waf >>
42-
- build_ingress_nginx_module:
43-
name: build ingress-nginx-<< matrix.version >> on << matrix.arch >>
44-
matrix:
45-
parameters:
46-
arch:
47-
- 'amd64'
48-
- 'arm64'
49-
version:
50-
- 1.12.0
51-
- coverage:
52-
name: Coverage on 1.27.0 with WAF ON
53-
- test:
54-
matrix:
55-
parameters:
56-
arch:
57-
- amd64
58-
- arm64
59-
waf:
60-
- 'ON'
61-
- 'OFF'
62-
base-image:
63-
- nginx:1.27.3-alpine
64-
- nginx:1.27.3
65-
nginx-version:
66-
- 1.27.3
67-
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch
68-
>> WAF << matrix.waf >>
69-
requires:
70-
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf
71-
>>
72-
- test-openresty:
73-
matrix:
74-
parameters:
75-
arch:
76-
- amd64
77-
- arm64
78-
waf:
79-
- 'ON'
80-
- 'OFF'
81-
base-image:
82-
- openresty/openresty:1.27.1.1-alpine
83-
resty-version:
84-
- 1.27.1.1
85-
name: test openresty << matrix.resty-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
86-
requires:
87-
- build openresty << matrix.resty-version >> on << matrix.arch >> WAF << matrix.waf >>
88-
- test:
89-
matrix:
90-
parameters:
91-
arch:
92-
- amd64
93-
- arm64
94-
waf:
95-
- 'ON'
96-
- 'OFF'
97-
base-image:
98-
- amazonlinux:2.0.20230418.0
99-
nginx-version:
100-
- 1.22.1
101-
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch
102-
>> WAF << matrix.waf >>
103-
requires:
104-
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf
105-
>>
106-
- test:
107-
matrix:
108-
parameters:
109-
arch:
110-
- amd64
111-
- arm64
112-
waf:
113-
- 'ON'
114-
- 'OFF'
115-
base-image:
116-
- amazonlinux:2023.3.20240219.0
117-
nginx-version:
118-
- 1.24.0
119-
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
120-
requires:
121-
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
122-
- test_ingress:
123-
name: test ingress-nginx-<< matrix.nginx-version >> on << matrix.arch >>
124-
requires:
125-
- build ingress-nginx-<< matrix.nginx-version >> on << matrix.arch >>
126-
matrix:
127-
parameters:
128-
arch:
129-
- amd64
130-
- arm64
131-
base-image:
132-
- registry.k8s.io/ingress-nginx/controller
133-
nginx-version:
134-
- 1.12.0
135-
- system_tests:
136-
name: Run system tests
137-
requires:
138-
- build 1.25.4 on amd64 WAF ON

0 commit comments

Comments
 (0)