Skip to content

Commit 912a2d9

Browse files
authored
temporarily disable builds failing for NAP WAF v4 on UBI (#7606)
1 parent bca1685 commit 912a2d9

File tree

5 files changed

+8
-26
lines changed

5 files changed

+8
-26
lines changed

.github/config/config-gcr-retag

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev
22
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-mktpl" "-alpine-fips")
3+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-mktpl" "-alpine-fips")
44
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
55
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
77
declare -a ADDITIONAL_TAGS=()
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export TARGET_REGISTRY=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/release
22
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips" "-mktpl")
3-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips" "-mktpl")
3+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips" "-mktpl")
44
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-alpine-fips" "-ubi8")
55
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
6+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-mktpl")
77
declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}")
88
export PUBLISH_OSS=false

.github/config/config-plus-nginx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
export TARGET_REGISTRY=docker-mgmt.nginx.com
22
export TARGET_NAP_WAF_DOS_IMAGE_PREFIX="nginx-ic-nap-dos/nginx-plus-ingress"
33
declare -a PLUS_TAG_POSTFIX_LIST=("" "-ubi" "-alpine" "-alpine-fips")
4-
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
4+
declare -a NAP_WAF_TAG_POSTFIX_LIST=("" "-alpine-fips")
55
declare -a NAP_WAFV5_TAG_POSTFIX_LIST=("" "-ubi" "-ubi8" "-alpine-fips")
66
declare -a NAP_DOS_TAG_POSTFIX_LIST=("" "-ubi")
7-
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
7+
declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("")
88
export PUBLISH_OSS=false

.github/data/matrix-images-nap.json

-18
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,18 @@
1515
"waf,dos"
1616
],
1717
"include": [
18-
{
19-
"image": "ubi-8-plus-nap",
20-
"target": "goreleaser",
21-
"platforms": "linux/amd64",
22-
"nap_modules": "waf"
23-
},
2418
{
2519
"image": "ubi-8-plus-nap-v5",
2620
"target": "goreleaser",
2721
"platforms": "linux/amd64",
2822
"nap_modules": "waf"
2923
},
30-
{
31-
"image": "ubi-9-plus-nap",
32-
"target": "goreleaser",
33-
"platforms": "linux/amd64",
34-
"nap_modules": "waf"
35-
},
3624
{
3725
"image": "ubi-9-plus-nap",
3826
"target": "goreleaser",
3927
"platforms": "linux/amd64",
4028
"nap_modules": "dos"
4129
},
42-
{
43-
"image": "ubi-9-plus-nap",
44-
"target": "goreleaser",
45-
"platforms": "linux/amd64",
46-
"nap_modules": "waf,dos"
47-
},
4830
{
4931
"image": "alpine-plus-nap-fips",
5032
"target": "goreleaser",

.github/data/matrix-smoke-nap.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"images": [
33
{
44
"label": "AP_WAF 1/4",
5-
"image": "ubi-8-plus-nap",
5+
"image": "debian-plus-nap",
66
"type": "plus",
77
"nap_modules": "waf",
88
"marker": "appprotect_waf_policies_allow",
99
"platforms": "linux/amd64"
1010
},
1111
{
1212
"label": "AP_WAF 2/4",
13-
"image": "ubi-9-plus-nap",
13+
"image": "debian-plus-nap",
1414
"type": "plus",
1515
"nap_modules": "waf",
1616
"marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow and not appprotect_waf_policies_vsr'",

0 commit comments

Comments
 (0)