Merge "Clean up CSIT images"

diff --git a/jjb/autorelease/validate-autorelease-phosphorus.yaml b/jjb/autorelease/validate-autorelease-phosphorus.yaml
new file mode 100644 (file)
index 0000000..1de7bb9
--- /dev/null
+++ b/jjb/autorelease/validate-autorelease-phosphorus.yaml
@@ -0,0 +1,27 @@
+---
+# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job
+- project:
+    name: autorelease-validate-phosphorus
+    jobs:
+      - "{project-name}-validate-autorelease-{stream}"
+    stream: phosphorus
+    branch: master
+    project-name:
+      - bgpcep:
+          project: bgpcep
+      - daexim:
+          project: daexim
+      - integration-distribution:
+          project: integration/distribution
+      - jsonrpc:
+          project: jsonrpc
+      - lispflowmapping:
+          project: lispflowmapping
+      - neutron:
+          project: neutron
+      - openflowplugin:
+          project: openflowplugin
+      - ovsdb:
+          project: ovsdb
+      - serviceutils:
+          project: serviceutils

diff --git a/jjb/autorelease/view-autorelease-phosphorus.yaml b/jjb/autorelease/view-autorelease-phosphorus.yaml
new file mode 100644 (file)
index 0000000..e4c2438
--- /dev/null
+++ b/jjb/autorelease/view-autorelease-phosphorus.yaml
@@ -0,0 +1,34 @@
+---
+# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job
+- releng_view: &releng_autorelease_view_common_phosphorus
+    name: releng-view-autorelease-phosphorus
+    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: Merge-Phosphorus
+    description: "List of Phosphorus Merge jobs for Autorelease"
+    job-name:
+      - "bgpcep-maven-merge-phosphorus"
+      - "daexim-maven-merge-phosphorus"
+      - "integration/distribution-maven-merge-phosphorus"
+      - "jsonrpc-maven-merge-phosphorus"
+      - "lispflowmapping-maven-merge-phosphorus"
+      - "neutron-maven-merge-phosphorus"
+      - "openflowplugin-maven-merge-phosphorus"
+      - "ovsdb-maven-merge-phosphorus"
+      - "serviceutils-maven-merge-phosphorus"
+    <<: *releng_autorelease_view_common_phosphorus

diff --git a/jjb/integration/csit-jobs-phosphorus.lst b/jjb/integration/csit-jobs-phosphorus.lst
index 38a360c71b1c51c2422968205799760857abac95..b5c7fd3e774c5d3695e6ced05e9acf3df4dab5be 100644 (file)
--- a/jjb/integration/csit-jobs-phosphorus.lst
+++ b/jjb/integration/csit-jobs-phosphorus.lst
@@ -1,18 +1,11 @@
-aaa-csit-1node-authn-all-phosphorus,
 bgpcep-csit-1node-bgp-ingest-all-phosphorus,
 bgpcep-csit-1node-bgp-ingest-mixed-all-phosphorus,
 bgpcep-csit-1node-throughpcep-all-phosphorus,
 bgpcep-csit-1node-userfeatures-all-phosphorus,
 daexim-csit-1node-basic-only-phosphorus,
 daexim-csit-3node-clustering-basic-only-phosphorus,
+distribution-csit-managed-phosphorus,
 jsonrpc-csit-1node-basic-only-phosphorus,
-netconf-csit-1node-callhome-only-phosphorus,
-netconf-csit-1node-scale-max-devices-only-phosphorus,
-netconf-csit-1node-scale-only-phosphorus,
-netconf-csit-1node-userfeatures-all-phosphorus,
-netconf-csit-1node-userfeatures-rfc8040-all-phosphorus,
-netconf-csit-3node-clustering-only-phosphorus,
-netconf-csit-3node-clustering-scale-only-phosphorus,
 odltools-csit-1node-upstream-all-phosphorus,
 openflowplugin-csit-1node-cbench-only-phosphorus,
 openflowplugin-csit-1node-flow-services-all-phosphorus,

diff --git a/jjb/integration/csit-jobs-silicon.lst b/jjb/integration/csit-jobs-silicon.lst
index 0af625c8a6990f40da4be9acac16cb54b47cbc2f..64d9502164c5d086ed9dde0193b50877be916c64 100644 (file)
--- a/jjb/integration/csit-jobs-silicon.lst
+++ b/jjb/integration/csit-jobs-silicon.lst
@@ -1,4 +1,3 @@
-aaa-csit-1node-authn-all-silicon,
 bgpcep-csit-1node-bgp-ingest-all-silicon,
 bgpcep-csit-1node-bgp-ingest-mixed-all-silicon,
 bgpcep-csit-1node-throughpcep-all-silicon,
@@ -8,13 +7,6 @@ daexim-csit-3node-clustering-basic-only-silicon,
 distribution-csit-1node-userfeatures-all-silicon,
 distribution-csit-managed-silicon,
 jsonrpc-csit-1node-basic-only-silicon,
-netconf-csit-1node-callhome-only-silicon,
-netconf-csit-1node-scale-max-devices-only-silicon,
-netconf-csit-1node-scale-only-silicon,
-netconf-csit-1node-userfeatures-all-silicon,
-netconf-csit-1node-userfeatures-rfc8040-all-silicon,
-netconf-csit-3node-clustering-only-silicon,
-netconf-csit-3node-clustering-scale-only-silicon,
 odltools-csit-1node-upstream-all-silicon,
 openflowplugin-csit-1node-cbench-only-silicon,
 openflowplugin-csit-1node-flow-services-all-silicon,