Use kni-cloud node for cloud jobs

And kni-baremetal for baremetal jobs.  The two long-lived jenkins
nodes prd-kni-baremetal-1 and -2 are different; one has cloud
credentials, the other is for bare metal deployments.  Use the
more specific kni-cloud and kni-baremetal labels (already present
on the nodes) to select them for the appropriate jobs.

Signed-off-by: James E. Blair <jeblair@redhat.com>
Change-Id: I20c9601934e8e9b5bdb89c56ef168985891c4fdd

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index aacb6e7..0814f6e 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -149,7 +149,7 @@
 - job-template:
     id: kni-verify-deploy-aws
     name: 'kni-{project-name}-verify-deploy-aws'
 - job-template:
     id: kni-verify-deploy-aws
     name: 'kni-{project-name}-verify-deploy-aws'

-    build-node: kni-job
+    build-node: kni-cloud

     <<: *kni_common_deploy
 
     gerrit_trigger_file_paths:
     <<: *kni_common_deploy
 
     gerrit_trigger_file_paths:


@@ -173,7 +173,7 @@
 - job-template:
     id: kni-verify-deploy-gcp
     name: 'kni-{project-name}-verify-deploy-gcp'
 - job-template:
     id: kni-verify-deploy-gcp
     name: 'kni-{project-name}-verify-deploy-gcp'

-    build-node: kni-job
+    build-node: kni-cloud

     <<: *kni_common_deploy
 
     gerrit_trigger_file_paths:
     <<: *kni_common_deploy
 
     gerrit_trigger_file_paths:


@@ -199,7 +199,7 @@
     name: 'kni-{project-name}-verify-deploy-baremetal'
     <<: *kni_common_deploy
     build-timeout: 120
     name: 'kni-{project-name}-verify-deploy-baremetal'
     <<: *kni_common_deploy
     build-timeout: 120

-    build-node: kni-job
+    build-node: kni-baremetal

 
     gerrit_trigger_file_paths:
       - compare-type: ANT
 
     gerrit_trigger_file_paths:
       - compare-type: ANT