Merge "Rename Artifact and JJB Related Jobs"

diff --git a/jjb/opnfv/artifact-cleanup.yml b/jjb/opnfv/artifact-cleanup.yml
index b0f8191..1c609a4 100644 (file)
--- a/jjb/opnfv/artifact-cleanup.yml
+++ b/jjb/opnfv/artifact-cleanup.yml
@@ -1,10 +1,10 @@
 - project:
-    name: artifact-cleanup
+    name: releng-artifact-cleanup
 
     project: 'releng'
 
     jobs:
-        - 'artifact-cleanup-daily-{stream}'
+        - 'releng-artifact-cleanup-daily-{stream}'
 
     stream:
         - master:
@@ -13,7 +13,7 @@
 
 
 - job-template:
-    name: 'artifact-cleanup-daily-{stream}'
+    name: 'releng-artifact-cleanup-daily-{stream}'
 
     # Job template for daily builders
     #

diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index 2d88449..ccfe11e 100644 (file)
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -1,14 +1,14 @@
 - project:
-    name: builder-jobs
+    name: releng-builder-jobs
     jobs:
-        - 'builder-verify-jjb'
-        - 'builder-merge'
-        - 'artifacts-api'
+        - 'releng-verify-jjb'
+        - 'releng-merge-jjb'
+        - 'releng-generate-artifacts-api'
 
     project: 'releng'
 
 - job-template:
-    name: builder-verify-jjb
+    name: releng-verify-jjb
 
     parameters:
         - project-parameter:
@@ -57,7 +57,7 @@
             artifacts: 'job_output/*'
 
 - job-template:
-    name: 'builder-merge'
+    name: 'releng-merge-jjb'
 
     # builder-merge job to run JJB update
     #
@@ -101,7 +101,7 @@
                 jenkins-jobs update -r --delete-old jjb/
 
 - job-template:
-    name: 'artifacts-api'
+    name: 'releng-generate-artifacts-api'
 
     # Generate and upload the JSON file to used for artifacts site