3 files changed, 35 insertions, 15 deletions
diff --git a/waivers/nonssl_endpoints/nonssl_xfail.txt b/waivers/nonssl_endpoints/nonssl_xfail.txt
index 7aa9f4c..1a24ab6 100644
--- a/waivers/nonssl_endpoints/nonssl_xfail.txt
+++ b/waivers/nonssl_endpoints/nonssl_xfail.txt
@@ -1,17 +1,4 @@
 # Expected failure list for non-SSL endpoints
 
-
-# frankfurt History
-# robot 30209
-# message-router 30227
-# sniro-emulator 30288
-# aaf-fs 31115
-## Frankfurt SECCOM waiver:
-# log-kibana 30253
-# log-es 30254
-# log-ls 30255
-## Waiver for Frankfurt due to AAF impact
-# so 30277
-## Upstream:
-# awx-web 30478
-# netbox-nginx 30420
+# Upstream components
+awx
diff --git a/waivers/root_pods/root_pods_xfail.txt b/waivers/root_pods/root_pods_xfail.txt
index 23dd63a..9569d97 100644
--- a/waivers/root_pods/root_pods_xfail.txt
+++ b/waivers/root_pods/root_pods_xfail.txt
@@ -1 +1,18 @@
 # Expected failure list for rooted ports
+
+# Unmaintained but still needed components
+aaf
+music
+
+# waivers requested already in Guilin but no progress
+dcae-cloudify # DCAEGEN2-2424
+multicloud-k8s # MULTICLOUD-1201
+
+# Upstream components
+cassandra # OOM-2552
+awx # used for use cases
+netbox # used for use cases
+multicloud-fcaps # rabbit-mq
+
+# Testing components
+robot # use for test cases + refactoring planned in Istanbul INT-1716
+\ No newline at end of file
diff --git a/waivers/unlimitted_pods/unlimitted_pods_xfail.txt b/waivers/unlimitted_pods/unlimitted_pods_xfail.txt
index 1e18144..5ad1555 100644
--- a/waivers/unlimitted_pods/unlimitted_pods_xfail.txt
+++ b/waivers/unlimitted_pods/unlimitted_pods_xfail.txt
@@ -1 +1,17 @@
 # Expected failure list for unlimitted pods
+# Components in maintenance mode
+music
+esr
+
+# waivers
+
+# upstream components
+awx # used for use cases
+netbox # used for use cases
+
+# testing
+network-name-gen # used for use cases
+
+# config pod
+portal-db-config # config pod
+vnfsdk-init-postgres