add nginx 1.25.2 to build/test/release (DataDog#36)

cataphract · Aug 25, 2023 · ba448a0 · ba448a0
1 parent 12b690e
commit ba448a0
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -542,6 +542,42 @@ workflows:
             only: /^v[0-9]+\.[0-9]+\.[0-9]+/
           branches:
             ignore: /.*/
+    - build:
+        name: "build on nginx:1.25.2-alpine"
+        base-image: "nginx:1.25.2-alpine"
+        build-image: "datadog/docker-library:nginx-datadog-build-nginx_1.25.2-alpine"
+        nginx-version: "1.25.2"
+        filters:
+          tags:
+            only: /^v[0-9]+\.[0-9]+\.[0-9]+/
+    - test:
+        name: "test on nginx:1.25.2-alpine"
+        base-image: "nginx:1.25.2-alpine"
+        nginx-modules-path: "/usr/lib/nginx/modules"
+        nginx-conf-path: "/etc/nginx/nginx.conf"
+        requires:
+        - "build on nginx:1.25.2-alpine"
+        filters:
+          tags:
+            only: /^v[0-9]+\.[0-9]+\.[0-9]+/
+    - build:
+        name: "build on nginx:1.25.2"
+        base-image: "nginx:1.25.2"
+        build-image: "datadog/docker-library:nginx-datadog-build-nginx_1.25.2"
+        nginx-version: "1.25.2"
+        filters:
+          tags:
+            only: /^v[0-9]+\.[0-9]+\.[0-9]+/
+    - test:
+        name: "test on nginx:1.25.2"
+        base-image: "nginx:1.25.2"
+        nginx-modules-path: "/usr/lib/nginx/modules"
+        nginx-conf-path: "/etc/nginx/nginx.conf"
+        requires:
+        - "build on nginx:1.25.2"
+        filters:
+          tags:
+            only: /^v[0-9]+\.[0-9]+\.[0-9]+/
     - build:
         name: "build on nginx:1.25.1-alpine"
         base-image: "nginx:1.25.1-alpine"
@@ -550,6 +586,8 @@ workflows:
         filters:
           tags:
             only: /^v[0-9]+\.[0-9]+\.[0-9]+/
+          branches:
+            ignore: /.*/
     - test:
         name: "test on nginx:1.25.1-alpine"
         base-image: "nginx:1.25.1-alpine"
@@ -560,6 +598,8 @@ workflows:
         filters:
           tags:
             only: /^v[0-9]+\.[0-9]+\.[0-9]+/
+          branches:
+            ignore: /.*/
     - build:
         name: "build on nginx:1.25.1"
         base-image: "nginx:1.25.1"
@@ -568,6 +608,8 @@ workflows:
         filters:
           tags:
             only: /^v[0-9]+\.[0-9]+\.[0-9]+/
+          branches:
+            ignore: /.*/
     - test:
         name: "test on nginx:1.25.1"
         base-image: "nginx:1.25.1"
@@ -578,6 +620,8 @@ workflows:
         filters:
           tags:
             only: /^v[0-9]+\.[0-9]+\.[0-9]+/
+          branches:
+            ignore: /.*/
     - build:
         name: "build on nginx:1.25.0-alpine"
         base-image: "nginx:1.25.0-alpine"

diff --git a/bin/generate_jobs_yaml.sh b/bin/generate_jobs_yaml.sh
@@ -34,8 +34,10 @@ amazonlinux:2.0.20220406.1 1.22.1 /usr/share/nginx/modules /etc/nginx/nginx.conf
 amazonlinux:2.0.20220316.0 1.22.1 /usr/share/nginx/modules /etc/nginx/nginx.conf
 amazonlinux:2.0.20220218.1 1.22.1 /usr/share/nginx/modules /etc/nginx/nginx.conf
 amazonlinux:2.0.20220121.0 1.22.1 /usr/share/nginx/modules /etc/nginx/nginx.conf
-nginx:1.25.1-alpine 1.25.1 /usr/lib/nginx/modules /etc/nginx/nginx.conf always
-nginx:1.25.1 1.25.1 /usr/lib/nginx/modules /etc/nginx/nginx.conf always
+nginx:1.25.2-alpine 1.25.2 /usr/lib/nginx/modules /etc/nginx/nginx.conf always
+nginx:1.25.2 1.25.2 /usr/lib/nginx/modules /etc/nginx/nginx.conf always
+nginx:1.25.1-alpine 1.25.1 /usr/lib/nginx/modules /etc/nginx/nginx.conf
+nginx:1.25.1 1.25.1 /usr/lib/nginx/modules /etc/nginx/nginx.conf
 nginx:1.25.0-alpine 1.25.0 /usr/lib/nginx/modules /etc/nginx/nginx.conf
 nginx:1.25.0 1.25.0 /usr/lib/nginx/modules /etc/nginx/nginx.conf
 nginx:1.24.0-alpine 1.24.0 /usr/lib/nginx/modules /etc/nginx/nginx.conf