Merge "Add new job to verify blueprint-basic-3-masters"

diff --git a/jjb/akraino-templates/akraino-jjb-kni.yaml b/jjb/akraino-templates/akraino-jjb-kni.yaml
index f031301..2be2952 100644 (file)
--- a/jjb/akraino-templates/akraino-jjb-kni.yaml
+++ b/jjb/akraino-templates/akraino-jjb-kni.yaml
@@ -181,8 +181,8 @@
       - lf-infra-publish
 
 - job-template:
-    id: kni-blueprint-pae-verify-deploy-aws
-    name: '{project-name}-verify-deploy-aws'
+    id: kni-verify-deploy-aws
+    name: 'kni-{project-name}-verify-deploy-aws'
 
     ######################
     # Default parameters #
@@ -254,7 +254,7 @@
           submodule-timeout: '{submodule-timeout}'
           submodule-disable: false
           choosing-strategy: default
-          basedir: 'blueprint-pae'
+          basedir: '{project-name}'
       - akraino-lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           git-url: '{git-url}/kni/installer.git'
@@ -291,8 +291,8 @@
       - lf-infra-publish
 
 - job-template:
-    id: kni-blueprint-pae-verify-deploy-libvirt
-    name: '{project-name}-verify-deploy-libvirt'
+    id: kni-verify-deploy-libvirt
+    name: 'kni-{project-name}-verify-deploy-libvirt'
 
     ######################
     # Default parameters #
@@ -376,7 +376,7 @@
           submodule-timeout: '{submodule-timeout}'
           submodule-disable: false
           choosing-strategy: default
-          basedir: 'blueprint-pae'
+          basedir: '{project-name}'
       - akraino-lf-infra-gerrit-scm:
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
           git-url: '{git-url}/kni/installer.git'

diff --git a/jjb/kni/kni_installer.yaml b/jjb/kni/kni_installer.yaml
index 62e7993..f3b41ff 100644 (file)
--- a/jjb/kni/kni_installer.yaml
+++ b/jjb/kni/kni_installer.yaml
@@ -13,9 +13,19 @@
 - project:
     name: kni-blueprint-pae
     project: 'kni/blueprint-pae'
-    project-name: kni-blueprint-pae
+    project-name: blueprint-pae
     stream: master
     branch: master
     jobs:
-      - kni-blueprint-pae-verify-deploy-aws
-      - kni-blueprint-pae-verify-deploy-libvirt
+      - kni-verify-deploy-aws
+      - kni-verify-deploy-libvirt
+
+- project:
+    name: kni-blueprint-basic-3-masters
+    project: 'kni/blueprint-basic-3-masters'
+    project-name: blueprint-basic-3-masters
+    stream: master
+    branch: master
+    jobs:
+      - kni-verify-deploy-aws
+      - kni-verify-deploy-libvirt