Skip to content

Commit f1e5aff

Browse files
dmehaladmehala
authoredFeb 7, 2025··
chore(nginx): support nginx 1.27.4 and 1.26.3 (#169)
1 parent e0e7b43 commit f1e5aff

File tree

5 files changed

+100
-10
lines changed

5 files changed

+100
-10
lines changed
 

‎.circleci/continue_config.yml

+47-5
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ jobs:
287287
command: git clone https://github.com/DataDog/system-tests.git
288288
name: clone system-tests repo
289289
- run:
290-
command: sudo apt-get install python3.12-venv
290+
command: "sudo apt update -y \nsudo apt install -y python3.12-venv\n"
291291
name: Install python 3.12
292292
- run:
293293
command: cp /tmp/workspace/.musl-build/ngx_http_datadog_module.so binaries/ngx_http_datadog_module-appsec-amd64-1.25.4.so
@@ -436,7 +436,7 @@ workflows:
436436
- 1.22.1
437437
- 1.24.0
438438
- 1.25.4
439-
- 1.27.3
439+
- 1.27.4
440440
waf:
441441
- "ON"
442442
- "OFF"
@@ -471,10 +471,10 @@ workflows:
471471
- amd64
472472
- arm64
473473
base-image:
474-
- nginx:1.27.3-alpine
475-
- nginx:1.27.3
474+
- nginx:1.27.4-alpine
475+
- nginx:1.27.4
476476
nginx-version:
477-
- 1.27.3
477+
- 1.27.4
478478
waf:
479479
- "ON"
480480
- "OFF"
@@ -622,10 +622,12 @@ workflows:
622622
- 1.26.0
623623
- 1.26.1
624624
- 1.26.2
625+
- 1.26.3
625626
- 1.27.0
626627
- 1.27.1
627628
- 1.27.2
628629
- 1.27.3
630+
- 1.27.4
629631
waf:
630632
- "ON"
631633
- "OFF"
@@ -665,6 +667,26 @@ workflows:
665667
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
666668
requires:
667669
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
670+
- test:
671+
filters:
672+
tags:
673+
only: /^v.*/
674+
matrix:
675+
parameters:
676+
arch:
677+
- amd64
678+
- arm64
679+
base-image:
680+
- nginx:1.27.4-alpine
681+
- nginx:1.27.4
682+
nginx-version:
683+
- 1.27.4
684+
waf:
685+
- "ON"
686+
- "OFF"
687+
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
688+
requires:
689+
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
668690
- test:
669691
filters:
670692
tags:
@@ -745,6 +767,26 @@ workflows:
745767
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
746768
requires:
747769
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
770+
- test:
771+
filters:
772+
tags:
773+
only: /^v.*/
774+
matrix:
775+
parameters:
776+
arch:
777+
- amd64
778+
- arm64
779+
base-image:
780+
- nginx:1.26.3-alpine
781+
- nginx:1.26.3
782+
nginx-version:
783+
- 1.26.3
784+
waf:
785+
- "ON"
786+
- "OFF"
787+
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
788+
requires:
789+
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
748790
- test:
749791
filters:
750792
tags:

‎.circleci/src/@jobs.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,9 @@ jobs:
240240
command: git clone https://github.com/DataDog/system-tests.git
241241
- run:
242242
name: Install python 3.12
243-
command: sudo apt-get install python3.12-venv
243+
command: |
244+
sudo apt update -y
245+
sudo apt install -y python3.12-venv
244246
- run:
245247
name: Move the module to the system-tests directory
246248
working_directory: ./system-tests

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

+42
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@
7474
- 1.26.0
7575
- 1.26.1
7676
- 1.26.2
77+
- 1.26.3
7778
- 1.27.0
7879
- 1.27.1
7980
- 1.27.2
8081
- 1.27.3
82+
- 1.27.4
8183
waf:
8284
- 'ON'
8385
- 'OFF'
@@ -117,6 +119,26 @@
117119
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
118120
requires:
119121
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
122+
- test:
123+
filters:
124+
tags:
125+
only: /^v.*/
126+
matrix:
127+
parameters:
128+
arch:
129+
- amd64
130+
- arm64
131+
waf:
132+
- 'ON'
133+
- 'OFF'
134+
base-image:
135+
- nginx:1.27.4-alpine
136+
- nginx:1.27.4
137+
nginx-version:
138+
- 1.27.4
139+
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
140+
requires:
141+
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
120142
- test:
121143
filters:
122144
tags:
@@ -197,6 +219,26 @@
197219
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
198220
requires:
199221
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
222+
- test:
223+
filters:
224+
tags:
225+
only: /^v.*/
226+
matrix:
227+
parameters:
228+
arch:
229+
- amd64
230+
- arm64
231+
waf:
232+
- 'ON'
233+
- 'OFF'
234+
base-image:
235+
- nginx:1.26.3-alpine
236+
- nginx:1.26.3
237+
nginx-version:
238+
- 1.26.3
239+
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
240+
requires:
241+
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
200242
- test:
201243
filters:
202244
tags:

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- 1.22.1
2323
- 1.24.0
2424
- 1.25.4
25-
- 1.27.3
25+
- 1.27.4
2626
waf:
2727
- 'ON'
2828
- 'OFF'
@@ -60,10 +60,10 @@ jobs:
6060
- 'ON'
6161
- 'OFF'
6262
base-image:
63-
- nginx:1.27.3-alpine
64-
- nginx:1.27.3
63+
- nginx:1.27.4-alpine
64+
- nginx:1.27.4
6565
nginx-version:
66-
- 1.27.3
66+
- 1.27.4
6767
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch
6868
>> WAF << matrix.waf >>
6969
requires:

‎bin/generate_jobs_yaml.rb

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
nginx_version_table = <<-TAB
44
amazonlinux:2023.3.20240219.0 1.24.0
5+
nginx:1.27.4-alpine 1.27.4
6+
nginx:1.27.4 1.27.4
57
nginx:1.27.3-alpine 1.27.3
68
nginx:1.27.3 1.27.3
79
nginx:1.27.2-alpine 1.27.2
@@ -10,6 +12,8 @@
1012
nginx:1.27.1 1.27.1
1113
nginx:1.27.0-alpine 1.27.0
1214
nginx:1.27.0 1.27.0
15+
nginx:1.26.3-alpine 1.26.3
16+
nginx:1.26.3 1.26.3
1317
nginx:1.26.2-alpine 1.26.2
1418
nginx:1.26.2 1.26.2
1519
nginx:1.26.1-alpine 1.26.1

0 commit comments

Comments
 (0)
Please sign in to comment.