Remove duplicated INSTALLER_NAME parameter

All the jobs should use INSTALLER_TYPE

Change-Id: I5386276fca837ba3ddda314f7c334c0f2957f78a
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>

diff --git a/jjb/apex/opnfv-apex.yml b/jjb/apex/opnfv-apex.yml
index de2947c..5240bba 100644 (file)
--- a/jjb/apex/opnfv-apex.yml
+++ b/jjb/apex/opnfv-apex.yml
@@ -80,5 +80,5 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Hello World from OPNFV $INSTALLER_NAME"
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Hello World from OPNFV $INSTALLER_TYPE"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"

diff --git a/jjb/compass4nfv/opnfv-compass4nfv.yml b/jjb/compass4nfv/opnfv-compass4nfv.yml
index c647abc..288c7ab 100644 (file)
--- a/jjb/compass4nfv/opnfv-compass4nfv.yml
+++ b/jjb/compass4nfv/opnfv-compass4nfv.yml
@@ -80,5 +80,5 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Hello World from OPNFV $INSTALLER_NAME"
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Hello World from OPNFV $INSTALLER_TYPE"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"

diff --git a/jjb/fuel/opnfv-fuel.yml b/jjb/fuel/opnfv-fuel.yml
index a0fbce2..393f919 100644 (file)
--- a/jjb/fuel/opnfv-fuel.yml
+++ b/jjb/fuel/opnfv-fuel.yml
@@ -120,5 +120,5 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Hello World from OPNFV $INSTALLER_NAME"
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Hello World from OPNFV $INSTALLER_TYPE"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"

diff --git a/jjb/joid/joid.yml b/jjb/joid/joid.yml
index fdeddc6..28b019f 100644 (file)
--- a/jjb/joid/joid.yml
+++ b/jjb/joid/joid.yml
@@ -88,7 +88,7 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"
             echo "Please note that this is a quick try to see how joid deployment works"
             echo
             echo "Executing clean.sh"
@@ -107,7 +107,7 @@
     builders:
         - shell: |
             #!/bin/bash
-            echo "Running $INSTALLER_NAME with controller $CONTROLLER"
+            echo "Running $INSTALLER_TYPE with controller $CONTROLLER"
             echo "Please note that this is WIP generic builder"
             echo
             echo "Executing clean.sh"

diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 0895e63..64945c6 100644 (file)
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -5,13 +5,9 @@
             name: INSTALLER_IP
             default: '192.168.X.X'
             description: 'IP of the installer'
-        - string:
-            name: INSTALLER_NAME
-            default: apex
-            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
+            default: apex
             description: 'Installer used for deploying OPNFV on this POD'
 
 - parameter:
@@ -21,13 +17,9 @@
             name: INSTALLER_IP
             default: '192.168.200.2'
             description: 'IP of the installer'
-        - string:
-            name: INSTALLER_NAME
-            default: compass
-            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
+            default: compass
             description: 'Installer used for deploying OPNFV on this POD'
 
 - parameter:
@@ -38,7 +30,7 @@
             default: '10.20.0.2'
             description: 'IP of the installer'
         - string:
-            name: INSTALLER_NAME
+            name: INSTALLER_TYPE
             default: fuel
             description: 'Installer used for deploying OPNFV on this POD'
 
@@ -49,11 +41,7 @@
             name: INSTALLER_IP
             default: '192.168.Y.Y'
             description: 'IP of the installer'
-        - string:
-            name: INSTALLER_NAME
-            default: joid
-            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: INSTALLER_TYPE
-            default: $INSTALLER_NAME
+            default: joid
             description: 'Installer used for deploying OPNFV on this POD'