Revert "temporarily disable builds failing for NAP WAF v4 on UBI (#7606)"

This reverts commit 912a2d9.

Author: pdabelf5

.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=("" "-mktpl" "-alpine-fips")
+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=("" "-mktpl")
+declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
 declare -a ADDITIONAL_TAGS=()

.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=("" "-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=("" "-mktpl")
+declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi" "-mktpl")
 declare -a ADDITIONAL_TAGS=("latest" "${ADDITIONAL_TAG}")
 export PUBLISH_OSS=false

.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=("" "-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=("")
+declare -a NAP_WAF_DOS_TAG_POSTFIX_LIST=("" "-ubi")
 export PUBLISH_OSS=false

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

@@ -15,18 +15,36 @@
  "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",

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

@@ -2,15 +2,15 @@
  "images": [
  {
  "label": "AP_WAF 1/4",
- "image": "debian-plus-nap",
+ "image": "ubi-8-plus-nap",
  "type": "plus",
  "nap_modules": "waf",
  "marker": "appprotect_waf_policies_allow",
  "platforms": "linux/amd64"
  },
  {
  "label": "AP_WAF 2/4",
- "image": "debian-plus-nap",
+ "image": "ubi-9-plus-nap",
  "type": "plus",
  "nap_modules": "waf",
  "marker": "'appprotect_waf_policies and not appprotect_waf_policies_allow and not appprotect_waf_policies_vsr'",