From 23cb3b3c530b0c3f931cfbfa96d710e1096fb2e7 Mon Sep 17 00:00:00 2001 From: Damien Mehala Date: Thu, 6 Feb 2025 20:15:12 +0100 Subject: [PATCH 1/3] chore(nginx): support nginx 1.27.4 and 1.26.3 --- .circleci/continue_config.yml | 50 +++++++++++++++++-- .../src/workflows/build-and-test-all.yml | 42 ++++++++++++++++ .circleci/src/workflows/build-and-test.yml | 8 +-- bin/generate_jobs_yaml.rb | 4 ++ 4 files changed, 96 insertions(+), 8 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 28056c3d..7102004a 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -436,7 +436,7 @@ workflows: - 1.22.1 - 1.24.0 - 1.25.4 - - 1.27.3 + - 1.27.4 waf: - "ON" - "OFF" @@ -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" @@ -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" @@ -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: @@ -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: diff --git a/.circleci/src/workflows/build-and-test-all.yml b/.circleci/src/workflows/build-and-test-all.yml index 613d13bb..87627c51 100644 --- a/.circleci/src/workflows/build-and-test-all.yml +++ b/.circleci/src/workflows/build-and-test-all.yml @@ -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' @@ -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: @@ -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: diff --git a/.circleci/src/workflows/build-and-test.yml b/.circleci/src/workflows/build-and-test.yml index f09f39d6..ee013701 100644 --- a/.circleci/src/workflows/build-and-test.yml +++ b/.circleci/src/workflows/build-and-test.yml @@ -22,7 +22,7 @@ jobs: - 1.22.1 - 1.24.0 - 1.25.4 - - 1.27.3 + - 1.27.4 waf: - 'ON' - 'OFF' @@ -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: diff --git a/bin/generate_jobs_yaml.rb b/bin/generate_jobs_yaml.rb index 720372b1..52f01cf2 100755 --- a/bin/generate_jobs_yaml.rb +++ b/bin/generate_jobs_yaml.rb @@ -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 @@ -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 From 26b7fbe7e8cd0f1d40307818685c387f1e4cbb74 Mon Sep 17 00:00:00 2001 From: Damien Mehala Date: Fri, 7 Feb 2025 11:04:05 +0100 Subject: [PATCH 2/3] fix: python install --- .circleci/continue_config.yml | 2 +- .circleci/src/@jobs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 7102004a..95725de4 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -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 && apt install -y python3.12-venv 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 diff --git a/.circleci/src/@jobs.yml b/.circleci/src/@jobs.yml index 0789f436..446d6609 100644 --- a/.circleci/src/@jobs.yml +++ b/.circleci/src/@jobs.yml @@ -240,7 +240,7 @@ 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 && apt install -y python3.12-venv - run: name: Move the module to the system-tests directory working_directory: ./system-tests From 1cce9dc60ca0d29950426e0352d14394af1afd0a Mon Sep 17 00:00:00 2001 From: Damien Mehala Date: Fri, 7 Feb 2025 11:20:04 +0100 Subject: [PATCH 3/3] fix: python install 2 --- .circleci/continue_config.yml | 2 +- .circleci/src/@jobs.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml index 95725de4..11a7f2a4 100644 --- a/.circleci/continue_config.yml +++ b/.circleci/continue_config.yml @@ -287,7 +287,7 @@ jobs: command: git clone https://github.com/DataDog/system-tests.git name: clone system-tests repo - run: - command: sudo apt update -y && apt install -y python3.12-venv + command: "sudo apt update -y \nsudo apt install -y python3.12-venv\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 diff --git a/.circleci/src/@jobs.yml b/.circleci/src/@jobs.yml index 446d6609..d62267af 100644 --- a/.circleci/src/@jobs.yml +++ b/.circleci/src/@jobs.yml @@ -240,7 +240,9 @@ jobs: command: git clone https://github.com/DataDog/system-tests.git - run: name: Install python 3.12 - command: sudo apt update -y && apt install -y 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