6 files changed, 83 insertions, 74 deletions
diff --git a/waivers/check_certificates/nodeports_xfail.txt b/waivers/check_certificates/nodeports_xfail.txt
index 43bb131..5c08010 100644
--- a/waivers/check_certificates/nodeports_xfail.txt
+++ b/waivers/check_certificates/nodeports_xfail.txt
@@ -1,3 +1,2 @@
 # Expected failure list for certificates associated to nodeports
 666 # foo example nodeport
-robot
diff --git a/waivers/jdwp_ports/jdwp_xfail.txt b/waivers/jdwp_ports/jdwp_xfail.txt
index 6163f42..5973519 100644
--- a/waivers/jdwp_ports/jdwp_xfail.txt
+++ b/waivers/jdwp_ports/jdwp_xfail.txt
@@ -2,7 +2,6 @@
 # JDWP = Java Debug Wire Protocol
 # The following list displays pods and their associated pod that could be
 # considered as False positive
-onap-dcae-redis 6379 # Redis port
 onap-msb-eag 6379 # Redis port
 onap-msb-iag 6379 # Redis port
 onap-vfc-redis 6379 # Redis port
diff --git a/waivers/nonssl_endpoints/nonssl_xfail.txt b/waivers/nonssl_endpoints/nonssl_xfail.txt
index ce497e3..2b9afdb 100644
--- a/waivers/nonssl_endpoints/nonssl_xfail.txt
+++ b/waivers/nonssl_endpoints/nonssl_xfail.txt
@@ -1,9 +1,18 @@
 # Expected failure list for non-SSL endpoints
 
-# waivers requested already since Honolulu
-# SO-3237 SO-3237 The fix is decided to be introduction of ingress controller in oom and is in progress.
+# waivers requested
+# SO-3237 The fix is decided to be introduction of ingress controller in oom and is in progress.
 so 30277
+so 30477
 so-etsi-sol003-adapter 30406
+so-admin-cockpit 30424
+so-admin-cockpit 30224
+
+# CDS - being worked, but missed cutoff for Istanbul
+# cds-blueprints-processor-http 30449
+
+# SDNC - https://jira.onap.org/browse/SDNC-1628
+# sdnc-callhome 30266
 
 # CDS team working on either eliminating node port or moving to https. 
 # Not ready for Jakarta
@@ -13,5 +22,7 @@ cds-blueprints-processor-http 30449
 sdnc-callhome 30266
 
 # Upstream components
-awx-web 30478
-message-router-kafka 3049*
+# awx-web 30478
+# message-router-kafka 30490
+# message-router-kafka 30491
+# message-router-kafka 30492
diff --git a/waivers/root_pods/root_pods_xfail.txt b/waivers/root_pods/root_pods_xfail.txt
index 0bf0000..25c9029 100644
--- a/waivers/root_pods/root_pods_xfail.txt
+++ b/waivers/root_pods/root_pods_xfail.txt
@@ -1,18 +1,18 @@
 # Expected failure list for rooted ports
 
 # Unmaintained but still needed components
-aaf
+# aaf
 
 # waivers requested already since Guilin but no progress
-dcae-cloudify # DCAEGEN2-2424
+# dcae-cloudify # DCAEGEN2-2424
 
 # Upstream components
-cassandra # OOM-2552
-awx # used for use cases
-netbox # used for use cases
-multicloud-fcaps # rabbit-mq
-oof-has-etcd # etcd
-multicloud-k8s-etcd # etcd
+# cassandra # OOM-2552
+# awx # used for use cases
+# netbox # used for use cases
+# multicloud-fcaps # rabbit-mq
+# oof-has-etcd # etcd
+# multicloud-k8s-etcd # etcd
 
 # Testing components
-robot # use for test cases + refactoring planned in Istanbul INT-1716
+# robot # use for test cases + refactoring planned in Istanbul INT-1716
diff --git a/waivers/unlimitted_pods/unlimitted_pods_xfail.txt b/waivers/unlimitted_pods/unlimitted_pods_xfail.txt
index fffb6d5..f6e0db7 100644
--- a/waivers/unlimitted_pods/unlimitted_pods_xfail.txt
+++ b/waivers/unlimitted_pods/unlimitted_pods_xfail.txt
@@ -2,15 +2,15 @@
 # Components in maintenance mode
 
 # waivers
-esr # unmaintained components
+# esr # unmaintained components
 
 # upstream components
-awx # used for use cases
-netbox # used for use cases
+# awx # used for use cases
+# netbox # used for use cases
 
 # testing
-network-name-gen # used for use cases
+# network-name-gen # used for use cases
 
 # config pod
-portal-db-config # config pod
-vnfsdk-init-postgres
+# portal-db-config # config pod
+# vnfsdk-init-postgres
diff --git a/waivers/versions/versions_xfail.txt b/waivers/versions/versions_xfail.txt
index f493cca..b6359b5 100644
--- a/waivers/versions/versions_xfail.txt
+++ b/waivers/versions/versions_xfail.txt
@@ -4,11 +4,11 @@
 
 # upstream containers
 # may be fixable using a more recent version...
-cassandra
-awx-celery
-awx-rabbit
-awx-web
-dcae-cloudify-manager
+# cassandra
+# awx-celery
+# awx-rabbit
+# awx-web
+# dcae-cloudify-manager
 
 #sdnc exception
 sdnc-dmaap-listener
@@ -20,57 +20,57 @@ dcaemod-nifi-registry
 
 # unmaintained containers
 # nobody will work on that a priori
-esr-gui
-esr-server
-msb-discovery
-msb-eag
-msb-iag
-portal-app
-portal-cassandra
-portal-sdk
-portal-widget
-aaf-cass
-message-router-kafka
-message-router-zookeeper
-message-router
-robot
+# esr-gui
+# esr-server
+# msb-discovery
+# msb-eag
+# msb-iag
+# portal-app
+# portal-cassandra
+# portal-sdk
+# portal-widget
+# aaf-cass
+# message-router-kafka
+# message-router-zookeeper
+# message-router
+# robot
 
 # aai pods dependent on janusgraph which does not support Java 11 yet
-aai-graphadmin
-aai-resources
-aai-traversal
+# aai-graphadmin
+# aai-resources
+# aai-traversal
 
 # filebeat dockers
-filebeat
-filebeat-onap
-dcae-dashboard-filebeat
-dcae-deployment-handler-filebeat
-dcae-inventory-api-filebeat
-dcae-policy-handler-filebeat
-dcae-config-binding-service-fb-onap
-dcae-config-binding-service-fb-onap-i
-dmaap-dr-node-filebeat-onap
-dmaap-dr-prov-filebeat-onap
-esr-server-filebeat-onap
-modeling-etsicatalog-filebeat-onap
-msb-discovery-filebeat-onap
-sdc-be-filebeat-onap
-sdc-fe-filebeat-onap
-sdc-onboarding-be-filebeat-onap
-sdc-wfd-fe-filebeat-onap
-so-filebeat-onap
-so-bpmn-infra-filebeat-onap
-so-oof-adapter-filebeat-onap
-so-openstack-adapter-filebeat-onap
-so-sdc-controller-filebeat-onap
-so-sdnc-adapter-filebeat-onap
-vfc-generic-vnfm-driver-filebeat-onap
-vfc-huawei-vnfm-driver-filebeat-onap
-vfc-nslcm-filebeat-onap
-vfc-vnflcm-filebeat-onap
-vfc-vnfmgr-filebeat-onap
-vfc-vnfres-filebeat-onap
-vfc-zte-vnfm-driver-filebeat-onap
+# filebeat
+# filebeat-onap
+# dcae-dashboard-filebeat
+# dcae-deployment-handler-filebeat
+# dcae-inventory-api-filebeat
+# dcae-policy-handler-filebeat
+# dcae-config-binding-service-fb-onap
+# dcae-config-binding-service-fb-onap-i
+# dmaap-dr-node-filebeat-onap
+# dmaap-dr-prov-filebeat-onap
+# esr-server-filebeat-onap
+# modeling-etsicatalog-filebeat-onap
+# msb-discovery-filebeat-onap
+# sdc-be-filebeat-onap
+# sdc-fe-filebeat-onap
+# sdc-onboarding-be-filebeat-onap
+# sdc-wfd-fe-filebeat-onap
+# so-filebeat-onap
+# so-bpmn-infra-filebeat-onap
+# so-oof-adapter-filebeat-onap
+# so-openstack-adapter-filebeat-onap
+# so-sdc-controller-filebeat-onap
+# so-sdnc-adapter-filebeat-onap
+# vfc-generic-vnfm-driver-filebeat-onap
+# vfc-huawei-vnfm-driver-filebeat-onap
+# vfc-nslcm-filebeat-onap
+# vfc-vnflcm-filebeat-onap
+# vfc-vnfmgr-filebeat-onap
+# vfc-vnfres-filebeat-onap
+# vfc-zte-vnfm-driver-filebeat-onap
 
 # vnf drivers
-vfc-huawei-vnfm-driver
+# vfc-huawei-vnfm-driver