summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/apex/opnfv-apex.yml4
-rw-r--r--jjb/compass4nfv/opnfv-compass4nfv.yml4
-rw-r--r--jjb/fuel/opnfv-fuel.yml4
-rw-r--r--jjb/joid/joid.yml4
-rw-r--r--jjb/opnfv/installer-params.yml20
5 files changed, 12 insertions, 24 deletions
diff --git a/jjb/apex/opnfv-apex.yml b/jjb/apex/opnfv-apex.yml
index de2947cec..5240bbabb 100644
--- 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 c647abcf8..288c7abe6 100644
--- 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 a0fbce26b..393f919d0 100644
--- 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 fdeddc680..28b019fcd 100644
--- 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 0895e6305..64945c656 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -6,12 +6,8 @@
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:
@@ -22,12 +18,8 @@
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'
@@ -50,10 +42,6 @@
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'