From 4a2569cfe3da858a8e69994f9d23c2a073f44822 Mon Sep 17 00:00:00 2001
From: Thanh Ha <zxiiro@gmail.com>
Date: Wed, 10 Apr 2019 09:42:29 +0800
Subject: [PATCH] Remove view anchors

View anchors are inconsistent and completely depend on JJB's parsing
order. Since view-templates are available now drop usage of cross
YAML view anchors.

This patch allows us to switch `retain_anchors = False` to turn off
this feature.

Change-Id: Ie7b476a3d70b32294f7938da3c33c1c5912aad43
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
---
 jjb/integration/integration-test-jobs.yaml | 32 +++++++++++++-
 jjb/releng-views.yaml                      | 50 +++++++---------------
 2 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index fb2caf47e..bb8b0d3b9 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -629,7 +629,21 @@
       - ovsdb-csit-3node-upstream-clustering-only-fluorine
       - sfc-csit-3node-docker-full-deploy-all-fluorine
       - sfc-csit-3node-rest-basic-all-fluorine
-    <<: *releng_view_common
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
 
 - view:
     name: csit-stable-ne
@@ -669,4 +683,18 @@
       - ovsdb-csit-3node-upstream-clustering-only-neon
       - sfc-csit-3node-docker-full-deploy-all-neon
       - sfc-csit-3node-rest-basic-all-neon
-    <<: *releng_view_common
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml
index 18e5efb10..d9b7c2f38 100644
--- a/jjb/releng-views.yaml
+++ b/jjb/releng-views.yaml
@@ -1,38 +1,4 @@
 ---
-- integration_view_csit: &integration_view_csit
-    name: integration-view-csit
-    view-type: list
-    filter-executors: false
-    filter-queue: false
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-      - robot-list
-    recurse: false
-
-- releng_view: &releng_view_common
-    name: releng-view-common
-    view-type: list
-    filter-executors: false
-    filter-queue: false
-    columns:
-      - status
-      - weather
-      - job
-      - last-success
-      - last-failure
-      - last-duration
-      - build-button
-      - jacoco
-      - find-bugs
-      - robot-list
-    recurse: false
-
 - project:
     name: '00-Empty View'
     views:
@@ -52,7 +18,21 @@
       most-recent:
         max-to-include: 25
         check-start-time: true
-    <<: *releng_view_common
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
 
 - project:
     name: All-Sonar
-- 
2.36.6