Provide common cleanup script to be used across projects

[ci-management.git] / jjb / nsh_sfc / nsh_sfc.yaml

diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml
index 199f5eb..90d4609 100644 (file)
--- a/jjb/nsh_sfc/nsh_sfc.yaml
+++ b/jjb/nsh_sfc/nsh_sfc.yaml
@@ -7,12 +7,16 @@
 
     project: 'nsh_sfc'
     os:
-        - ubuntu1404
-        - ubuntu1604
-        - centos7
+        - ubuntu1404:
+            repo-os-part: 'ubuntu.trusty.main'
+        - ubuntu1604:
+            repo-os-part: 'ubuntu.xenial.main'
+        - centos7:
+            repo-os-part: 'centos7'
     stream:
         - master:
             branch: 'master'
+            repo-stream-part: 'master'
 
 - job-template:
     name: 'nsh_sfc-verify-{stream}-{os}'
@@ -34,6 +38,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
@@ -53,7 +59,10 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-nsh_sfc-build.sh
+            !include-raw-escape:
+                - ../scripts/cleanup_vpp_plugin_dev_env.sh
+                - include-raw-nsh_sfc-build.sh
+                - ../scripts/cleanup_vpp_plugin_dev_env.sh
 
 - job-template:
     name: 'nsh_sfc-verify-image-{stream}-{os}'
@@ -75,6 +84,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
@@ -107,7 +118,10 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-nsh_sfc-build.sh
+            !include-raw-escape:
+                - ../scripts/cleanup_vpp_plugin_dev_env.sh
+                - include-raw-nsh_sfc-build.sh
+                - ../scripts/cleanup_vpp_plugin_dev_env.sh
 
 - job-template:
     name: 'nsh_sfc-merge-{stream}-{os}'
@@ -128,6 +142,8 @@
             branch: '{branch}'
         - os-parameter:
             os: '{os}'
+        - repo-name-parameter:
+            repo-name: '{repo-stream-part}.{repo-os-part}'
 
     scm:
         - gerrit-trigger-scm:
@@ -147,4 +163,7 @@
 
     builders:
         - shell:
-            !include-raw-escape: include-raw-nsh_sfc-build.sh
\ No newline at end of file
+            !include-raw-escape:
+                - ../scripts/cleanup_vpp_plugin_dev_env.sh
+                - include-raw-nsh_sfc-build.sh
+                - ../scripts/cleanup_vpp_plugin_dev_env.sh
\ No newline at end of file