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

diff --combined jjb/genius/genius-csit-genius.yaml
index acf89cb58adc08cb830f0aa0a63cdc2a2de190a3,8f6ba167658a3672aece962c11d25462afdb130d..5e01210a39846aa87e6ad0205e20f356f6684f92
--- 1/jjb/genius/genius-csit-genius.yaml
--- 2/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 80f2abea3ef07eea8a1abd91179982675dce4ceb,f9284469eebdc75d84fdcb2ca80423d8f4266507..d651eef758b2c690fcb08508f75cc3e8c390e7ff
--- 1/jjb/integration/integration-templates.yaml
--- 2/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