Renaming Fabric Post-Jobs

Change-Id: I833792fc232f077c0d0183d1e9f8e88989215d0e
diff --git a/jjb/OnosSystemTest/onos-test-freestyle.yaml b/jjb/OnosSystemTest/onos-test-freestyle.yaml
index 592ab29..832b17d 100644
--- a/jjb/OnosSystemTest/onos-test-freestyle.yaml
+++ b/jjb/OnosSystemTest/onos-test-freestyle.yaml
@@ -503,9 +503,9 @@
            - 'VM'
            - 'BM'
            - 'Fabric'
-           - 'Fabric2'
-           - 'Fabric3'
-           - 'Fabric4'
+           - 'Fabric-1.x'
+           - 'Fabric-2.x'
+           - 'Fabric-master'
            - 'Fabric5'
            - 'Trellis-POD'
 
@@ -591,4 +591,3 @@
 
     jobs:
       - 'test-HA'
-