From: Luis Gomez <ecelgp@gmail.com>
Date: Thu, 25 Jan 2018 17:08:17 +0000 (+0000)
Subject: Merge "Switch the csit-verify-3node to use job prefix"
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f618ffefcc5a3904f0fdcc2db3bcb88323bcd425;hp=-c;p=releng%2Fbuilder.git

Merge "Switch the csit-verify-3node to use job prefix"
---

f618ffefcc5a3904f0fdcc2db3bcb88323bcd425
diff --combined jjb/genius/genius-csit-genius.yaml
index acf89cb58,8f6ba1676..5e01210a3
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@@ -3,9 -3,9 +3,9 @@@
      name: genius-csit-genius
      jobs:
        - '{project}-csit-3node-{functionality}-{install}-{stream}'
 -      - '{project}-csit-1node-{functionality}-{install}-{stream}'
 +      - inttest-csit-1node
        - inttest-csit-verify-1node
-       - '{project}-csit-verify-3node-{functionality}'
+       - inttest-csit-verify-3node
  
  
      # The project name
diff --combined jjb/integration/integration-templates.yaml
index 80f2abea3,f9284469e..d651eef75
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@@ -120,8 -120,7 +120,8 @@@
        - lf-infra-publish
  
  - job-template:
 -    name: '{project}-csit-1node-{functionality}-{install}-{stream}'
 +    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
 +    id: inttest-csit-1node
      # Keep synchronized with *-csit4-*-carbon please.
      disabled: false
  
@@@ -241,8 -240,7 +241,8 @@@
        - lf-infra-publish
  
  - job-template:
 -    name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 +    name: '{prefix}{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
 +    id: inttest-csit-1node-periodic
      disabled: false
  
      project-type: freestyle
@@@ -468,7 -466,8 +468,8 @@@
        - lf-infra-publish
  
  - job-template:
-     name: '{project}-csit-verify-3node-{functionality}'
+     name: '{prefix}{project}-csit-verify-3node-{functionality}'
+     id: inttest-csit-verify-3node
      disabled: false
  
      project-type: freestyle
@@@ -1417,8 -1416,7 +1418,8 @@@
  # triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
  
  - job-template:
 -    name: '{project}-patch-test-{feature}-{stream}'
 +    name: '{prefix}{project}-patch-test-{feature}-{stream}'
 +    id: inttest-patch-test
  
      project-type: freestyle
      node: centos7-builder-2c-8g