From 7096d3e163711e3650e084674990f746ddd59b4a Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Thu, 9 Jan 2025 15:29:06 +0000 Subject: [PATCH 1/2] remove ubi images from CI --- .github/config/config-gcr-retag | 10 +++--- .github/config/config-plus-gcr-release | 10 +++--- .github/config/config-plus-nginx | 10 +++--- .github/data/matrix-images-nap.json | 36 ------------------- .github/data/matrix-images-oss.json | 6 ---- .github/data/matrix-images-plus.json | 5 --- .github/data/matrix-smoke-nap.json | 8 ++--- .github/data/matrix-smoke-oss.json | 2 +- .github/data/matrix-smoke-plus.json | 4 +-- .github/data/patch-images.json | 48 -------------------------- 10 files changed, 22 insertions(+), 117 deletions(-) diff --git a/.github/config/config-gcr-retag b/.github/config/config-gcr-retag index 3273e6ffaf..07e0e71beb 100644 --- a/.github/config/config-gcr-retag +++ b/.github/config/config-gcr-retag @@ -1,7 +1,7 @@ export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev -declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl") -declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl" "-alpine-fips") -declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips") -declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl") -declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl") +declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips" "-mktpl") +declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-mktpl" "-alpine-fips") +declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips") +declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-mktpl") +declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-mktpl") declare -a ADDITIONAL_TAGS=() diff --git a/.github/config/config-plus-gcr-release b/.github/config/config-plus-gcr-release index e1c6d12e01..9cf8fb9723 100644 --- a/.github/config/config-plus-gcr-release +++ b/.github/config/config-plus-gcr-release @@ -1,8 +1,8 @@ export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release -declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl") -declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips" "-mktpl") -declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-alpine-fips" "-ubi8") -declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl") -declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl") +declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips" "-mktpl") +declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips" "-mktpl") +declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips") +declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-mktpl") +declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-mktpl") declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}") export PUBLISH_OSS=false diff --git a/.github/config/config-plus-nginx b/.github/config/config-plus-nginx index 546c636721..b7633a1434 100644 --- a/.github/config/config-plus-nginx +++ b/.github/config/config-plus-nginx @@ -1,8 +1,8 @@ export TARGET_REGISTRY=docker-mgmt.nginx.com export TARGET_NAP_WAF_DOS_IMAGE_PREFIX="nginx-ic-nap-dos/nginx-plus-ingress" -declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips") -declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips") -declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips") -declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi") -declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi") +declare -a PLUS_TAG_POSTFIX_LIST=("" "-alpine" "-alpine-fips") +declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips") +declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-alpine-fips") +declare -a NAP_DOS_TAG_POSTFIX_LIST=("") +declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("") export PUBLISH_OSS=false diff --git a/.github/data/matrix-images-nap.json b/.github/data/matrix-images-nap.json index b93c8404d3..a391e9314b 100644 --- a/.github/data/matrix-images-nap.json +++ b/.github/data/matrix-images-nap.json @@ -15,36 +15,6 @@ "waf,dos" ], "include": [ - { - "image": "ubi-8-plus-nap", - "target": "goreleaser", - "platforms": "linux/amd64", - "nap_modules": "waf" - }, - { - "image": "ubi-8-plus-nap-v5", - "target": "goreleaser", - "platforms": "linux/amd64", - "nap_modules": "waf" - }, - { - "image": "ubi-9-plus-nap", - "target": "goreleaser", - "platforms": "linux/amd64", - "nap_modules": "waf" - }, - { - "image": "ubi-9-plus-nap", - "target": "goreleaser", - "platforms": "linux/amd64", - "nap_modules": "dos" - }, - { - "image": "ubi-9-plus-nap", - "target": "goreleaser", - "platforms": "linux/amd64", - "nap_modules": "waf,dos" - }, { "image": "alpine-plus-nap-fips", "target": "goreleaser", @@ -62,12 +32,6 @@ "target": "goreleaser", "platforms": "linux/amd64", "nap_modules": "waf" - }, - { - "image": "ubi-9-plus-nap-v5", - "target": "goreleaser", - "platforms": "linux/amd64", - "nap_modules": "waf" } ] } diff --git a/.github/data/matrix-images-oss.json b/.github/data/matrix-images-oss.json index 237c3014fb..7c94faf8e3 100644 --- a/.github/data/matrix-images-oss.json +++ b/.github/data/matrix-images-oss.json @@ -5,11 +5,5 @@ ], "platforms": [ "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x" - ], - "include": [ - { - "image": "ubi", - "platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x" - } ] } diff --git a/.github/data/matrix-images-plus.json b/.github/data/matrix-images-plus.json index ab1717d37d..b74a88d670 100644 --- a/.github/data/matrix-images-plus.json +++ b/.github/data/matrix-images-plus.json @@ -15,11 +15,6 @@ "image": "debian-plus", "platforms": "linux/arm64, linux/amd64", "target": "aws" - }, - { - "image": "ubi-9-plus", - "platforms": "linux/arm64, linux/amd64", - "target": "goreleaser" } ] } diff --git a/.github/data/matrix-smoke-nap.json b/.github/data/matrix-smoke-nap.json index 1d780e7a7d..6def25f403 100644 --- a/.github/data/matrix-smoke-nap.json +++ b/.github/data/matrix-smoke-nap.json @@ -2,7 +2,7 @@ "images": [ { "label": "AP_WAF 1/4", - "image": "ubi-8-plus-nap", + "image": "debian-plus-nap", "type": "plus", "nap_modules": "waf", "marker": "appprotect_waf_policies_allow", @@ -10,7 +10,7 @@ }, { "label": "AP_WAF 2/4", - "image": "ubi-9-plus-nap", + "image": "debian-plus-nap", "type": "plus", "nap_modules": "waf", "marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow and not appprotect_waf_policies_vsr'", @@ -50,7 +50,7 @@ }, { "label": "AP_DOS 2/3", - "image": "debian-plus-nap", + "image": "alpine-plus-nap", "type": "plus", "nap_modules": "dos", "marker": "'dos_ingress and not dos_learning'", @@ -58,7 +58,7 @@ }, { "label": "AP_DOS 3/3", - "image": "ubi-9-plus-nap", + "image": "debian-plus-nap", "type": "plus", "nap_modules": "dos", "marker": "dos_learning", diff --git a/.github/data/matrix-smoke-oss.json b/.github/data/matrix-smoke-oss.json index a15b9b8937..52a9a7f456 100644 --- a/.github/data/matrix-smoke-oss.json +++ b/.github/data/matrix-smoke-oss.json @@ -72,7 +72,7 @@ }, { "label": "TS", - "image": "ubi", + "image": "debian", "type": "oss", "marker": "ts", "platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x" diff --git a/.github/data/matrix-smoke-plus.json b/.github/data/matrix-smoke-plus.json index 572d6e4d8a..a67fa4addb 100644 --- a/.github/data/matrix-smoke-plus.json +++ b/.github/data/matrix-smoke-plus.json @@ -65,14 +65,14 @@ }, { "label": "policies 1/2", - "image": "ubi-9-plus", + "image": "alpine-plus", "type": "plus", "marker": "'policies and not policies_ac and not policies_jwt and not policies_mtls'", "platforms": "linux/arm64, linux/amd64, linux/s390x" }, { "label": "policies 2/2", - "image": "ubi-9-plus", + "image": "debian-plus", "type": "plus", "marker": "'policies_ac or policies_jwt or policies_mtls'", "platforms": "linux/arm64, linux/amd64, linux/s390x" diff --git a/.github/data/patch-images.json b/.github/data/patch-images.json index b258b2c4ce..22b2662e35 100644 --- a/.github/data/patch-images.json +++ b/.github/data/patch-images.json @@ -11,12 +11,6 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress", "platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x" }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-ingress", - "source_os": "ubi", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-ingress", - "platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x" - }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress", "source_os": "debian", @@ -41,12 +35,6 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress", "platforms": "linux/arm64, linux/amd64" }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic/nginx-plus-ingress", - "source_os": "ubi", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic/nginx-plus-ingress", - "platforms": "linux/arm64, linux/amd64" - }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress", "source_os": "debian", @@ -59,18 +47,6 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress", "platforms": "linux/amd64" }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress", - "source_os": "ubi", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress", - "platforms": "linux/amd64" - }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress", - "source_os": "ubi8", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap/nginx-plus-ingress", - "platforms": "linux/amd64" - }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap/nginx-plus-ingress", "source_os": "alpine-fips", @@ -83,18 +59,6 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress", "platforms": "linux/amd64" }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress", - "source_os": "ubi", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress", - "platforms": "linux/amd64" - }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress", - "source_os": "ubi8", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-nap-v5/nginx-plus-ingress", - "platforms": "linux/amd64" - }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-nap-v5/nginx-plus-ingress", "source_os": "alpine-fips", @@ -113,12 +77,6 @@ "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress", "platforms": "linux/amd64" }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos/nginx-plus-ingress", - "source_os": "ubi", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos/nginx-plus-ingress", - "platforms": "linux/amd64" - }, { "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress", "source_os": "debian", @@ -130,11 +88,5 @@ "source_os": "mktpl", "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress", "platforms": "linux/amd64" - }, - { - "source_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release/nginx-ic-dos-nap/nginx-plus-ingress", - "source_os": "ubi", - "target_image": "gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic-dos-nap/nginx-plus-ingress", - "platforms": "linux/amd64" } ] From 4c8e02020b5e04d99c84e7cb08a8d2be72c380d5 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Thu, 9 Jan 2025 15:51:11 +0000 Subject: [PATCH 2/2] switch to debian for all dos tests --- .github/data/matrix-smoke-nap.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/data/matrix-smoke-nap.json b/.github/data/matrix-smoke-nap.json index 6def25f403..b2d6f4a400 100644 --- a/.github/data/matrix-smoke-nap.json +++ b/.github/data/matrix-smoke-nap.json @@ -50,7 +50,7 @@ }, { "label": "AP_DOS 2/3", - "image": "alpine-plus-nap", + "image": "debian-plus-nap", "type": "plus", "nap_modules": "dos", "marker": "'dos_ingress and not dos_learning'",