Skip to content

chore(nginx): support nginx 1.27.4 and 1.26.3 #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 7, 2025
Merged

chore(nginx): support nginx 1.27.4 and 1.26.3 #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23cb3b3
chore(nginx): support nginx 1.27.4 and 1.26.3
dmehala Feb 6, 2025
26b7fbe
fix: python install
dmehala Feb 7, 2025
1cce9dc
fix: python install 2
dmehala Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 47 additions & 5 deletions .circleci/continue_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ jobs:
command: git clone https://github.com/DataDog/system-tests.git
name: clone system-tests repo
- run:
command: sudo apt-get install python3.12-venv
command: "sudo apt update -y \nsudo apt install -y python3.12-venv\n"
Copy link
Collaborator

@pablomartinezbernardo pablomartinezbernardo Feb 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Can we use && instead of \n?

name: Install python 3.12
- run:
command: cp /tmp/workspace/.musl-build/ngx_http_datadog_module.so binaries/ngx_http_datadog_module-appsec-amd64-1.25.4.so
Expand Down Expand Up @@ -436,7 +436,7 @@ workflows:
- 1.22.1
- 1.24.0
- 1.25.4
- 1.27.3
- 1.27.4
waf:
- "ON"
- "OFF"
Expand Down Expand Up @@ -471,10 +471,10 @@ workflows:
- amd64
- arm64
base-image:
- nginx:1.27.3-alpine
- nginx:1.27.3
- nginx:1.27.4-alpine
- nginx:1.27.4
nginx-version:
- 1.27.3
- 1.27.4
waf:
- "ON"
- "OFF"
Expand Down Expand Up @@ -622,10 +622,12 @@ workflows:
- 1.26.0
- 1.26.1
- 1.26.2
- 1.26.3
- 1.27.0
- 1.27.1
- 1.27.2
- 1.27.3
- 1.27.4
waf:
- "ON"
- "OFF"
Expand Down Expand Up @@ -665,6 +667,26 @@ workflows:
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
requires:
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
- test:
filters:
tags:
only: /^v.*/
matrix:
parameters:
arch:
- amd64
- arm64
base-image:
- nginx:1.27.4-alpine
- nginx:1.27.4
nginx-version:
- 1.27.4
waf:
- "ON"
- "OFF"
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
requires:
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
- test:
filters:
tags:
Expand Down Expand Up @@ -745,6 +767,26 @@ workflows:
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
requires:
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
- test:
filters:
tags:
only: /^v.*/
matrix:
parameters:
arch:
- amd64
- arm64
base-image:
- nginx:1.26.3-alpine
- nginx:1.26.3
nginx-version:
- 1.26.3
waf:
- "ON"
- "OFF"
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
requires:
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
- test:
filters:
tags:
Expand Down
4 changes: 3 additions & 1 deletion .circleci/src/@jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,9 @@ jobs:
command: git clone https://github.com/DataDog/system-tests.git
- run:
name: Install python 3.12
command: sudo apt-get install python3.12-venv
command: |
sudo apt update -y
sudo apt install -y python3.12-venv
- run:
name: Move the module to the system-tests directory
working_directory: ./system-tests
Expand Down
42 changes: 42 additions & 0 deletions .circleci/src/workflows/build-and-test-all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@
- 1.26.0
- 1.26.1
- 1.26.2
- 1.26.3
- 1.27.0
- 1.27.1
- 1.27.2
- 1.27.3
- 1.27.4
waf:
- 'ON'
- 'OFF'
Expand Down Expand Up @@ -117,6 +119,26 @@
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
requires:
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
- test:
filters:
tags:
only: /^v.*/
matrix:
parameters:
arch:
- amd64
- arm64
waf:
- 'ON'
- 'OFF'
base-image:
- nginx:1.27.4-alpine
- nginx:1.27.4
nginx-version:
- 1.27.4
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
requires:
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
- test:
filters:
tags:
Expand Down Expand Up @@ -197,6 +219,26 @@
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
requires:
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
- test:
filters:
tags:
only: /^v.*/
matrix:
parameters:
arch:
- amd64
- arm64
waf:
- 'ON'
- 'OFF'
base-image:
- nginx:1.26.3-alpine
- nginx:1.26.3
nginx-version:
- 1.26.3
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch >> WAF << matrix.waf >>
requires:
- build << matrix.nginx-version >> on << matrix.arch >> WAF << matrix.waf >>
- test:
filters:
tags:
Expand Down
8 changes: 4 additions & 4 deletions .circleci/src/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- 1.22.1
- 1.24.0
- 1.25.4
- 1.27.3
- 1.27.4
waf:
- 'ON'
- 'OFF'
Expand Down Expand Up @@ -60,10 +60,10 @@ jobs:
- 'ON'
- 'OFF'
base-image:
- nginx:1.27.3-alpine
- nginx:1.27.3
- nginx:1.27.4-alpine
- nginx:1.27.4
nginx-version:
- 1.27.3
- 1.27.4
name: test << matrix.nginx-version >> on << matrix.base-image >>:<< matrix.arch
>> WAF << matrix.waf >>
requires:
Expand Down
4 changes: 4 additions & 0 deletions bin/generate_jobs_yaml.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

nginx_version_table = <<-TAB
amazonlinux:2023.3.20240219.0 1.24.0
nginx:1.27.4-alpine 1.27.4
nginx:1.27.4 1.27.4
nginx:1.27.3-alpine 1.27.3
nginx:1.27.3 1.27.3
nginx:1.27.2-alpine 1.27.2
Expand All @@ -10,6 +12,8 @@
nginx:1.27.1 1.27.1
nginx:1.27.0-alpine 1.27.0
nginx:1.27.0 1.27.0
nginx:1.26.3-alpine 1.26.3
nginx:1.26.3 1.26.3
nginx:1.26.2-alpine 1.26.2
nginx:1.26.2 1.26.2
nginx:1.26.1-alpine 1.26.1
Expand Down