Remove integration- from distribution jobs

The main motivation is that distribution-verify-{stream}
was trying to trigger integration-distribution-deploy-{stream}
which was already renamed.
This also updates comments, renames the yaml file, but leaves
integration-distribution-test-{stream} as that is more int/test than int/dist.

Change-Id: Ie3a2bb40dd8d07c6b4f47dd91e82a26328fb5851
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/distribution-jobs.yaml
similarity index 97%
rename from jjb/integration/integration-distribution-jobs.yaml
rename to jjb/integration/distribution-jobs.yaml
index 2641914ab823f592924e767fb446a31fd3089407..da71d2d61f53ab269398e2b66a7cc6facd8cbdee 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/distribution-jobs.yaml
@@ -1,6 +1,6 @@
 
 - project:
-    name: integration-distribution
+    name: distribution-jobs
     jobs:
         - '{project-name}-verify-python-{stream}'
         - 'distribution-verify-{stream}'
@@ -9,7 +9,7 @@
         - 'distribution-offline-{stream}'
 
     project: integration/distribution
-    project-name: integration-distribution
+    project-name: distribution
 
     stream:
         - carbon:
@@ -83,7 +83,7 @@
 
     postbuilders:
         - trigger-builds:
-            - project: 'integration-distribution-deploy-{stream}'
+            - project: 'distribution-deploy-{stream}'
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
@@ -206,7 +206,7 @@
             email-recipients: '{email-recipients}'
             email-prefix: '[int/dist]'
 
-# Template: integration-distribution-deploy-{stream}
+# Template: distribution-deploy-{stream}
 # Goal: Verify distribution starts with no issues when all features are loaded
 # Operation: This job deploys the controller installing odl-integration-all
 
@@ -255,7 +255,7 @@
         - opendaylight-infra-shiplogs:
             maven-version: 'mvn33'
 
-# Template: integration-distribution-offline-{stream}
+# Template: distribution-offline-{stream}
 # Goal: Verify distribution can start with no internet connection
 # Operation: This job deploys the controller removing any external repository definition
 

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 0dfdb2943861bfa0ebf8a5ddbd5bbd01baee89df..43f12f8087ad003cb97794f18712079c322c94e9 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -252,7 +252,7 @@
 
 # Macro: integration-deploy-controller-verify
 # Operation: this macro deploys the controller with all fetures
-# Used by: integration-distribution-deploy-{stream} job template
+# Used by: distribution-deploy-{stream} job template
 
 - builder:
     name: integration-deploy-controller-verify
@@ -318,7 +318,7 @@
 
 # Macro: integration-get-bundle-url-root
 # Operation: this macro gets the job generated distribution URL from root pom.xml
-# Used by: integration-distribution-verify-{stream} job template
+# Used by: distribution-verify-{stream} job template
 
 - builder:
     name: integration-get-bundle-url-root