onap: Use the right openrc file for the cloud
Change-Id: I7ea60a385c4cf96981b0d508ef9ea7ea488c573b
diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 8d4ed14..0346f94 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
@@ -129,6 +129,10 @@
default: '{distro}'
description: 'Distribution to use for configuring target nodes (networking etc.)'
- string:
+ name: OPENSTACK_CLOUD_PROVIDER
+ default: '{cloud}'
+ description: 'Name of the cloud where this job is run'
+ - string:
name: ONAP_VERSION
default: '{onap-version}'
description: 'ONAP version to deploy'
@@ -210,7 +214,7 @@
description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
- shell: |
#!/bin/bash
- cp $OPENRC_FILE /tmp/openrc
+ /bin/rm -rf /tmp/openrc && /bin/cp -f $OPENRC_FILE /tmp/openrc
- multijob:
name: Deploy ONAP using OOM
condition: ALWAYS
@@ -219,6 +223,7 @@
current-parameters: false
predefined-parameters: |
DISTRO=$DISTRO
+ OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
DEPLOY_TYPE=$DEPLOY_TYPE
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
@@ -247,6 +252,7 @@
current-parameters: false
predefined-parameters: |
DISTRO=$DISTRO
+ OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
DEPLOY_TYPE=$DEPLOY_TYPE
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
@@ -277,6 +283,7 @@
predefined-parameters: |
SLAVE_LABEL=$SLAVE_LABEL
DISTRO=$DISTRO
+ OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -302,6 +309,7 @@
predefined-parameters: |
SLAVE_LABEL=$SLAVE_LABEL
DISTRO=$DISTRO
+ OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -327,6 +335,7 @@
predefined-parameters: |
SLAVE_LABEL=$SLAVE_LABEL
DISTRO=$DISTRO
+ OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -352,6 +361,7 @@
predefined-parameters: |
SLAVE_LABEL=$SLAVE_LABEL
DISTRO=$DISTRO
+ OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -377,6 +387,7 @@
predefined-parameters: |
SLAVE_LABEL=$SLAVE_LABEL
DISTRO=$DISTRO
+ OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -406,6 +417,7 @@
predefined-parameters: |
SLAVE_LABEL=$SLAVE_LABEL
DISTRO=$DISTRO
+ OPENSTACK_CLOUD_PROVIDER=$OPENSTACK_CLOUD_PROVIDER
DEPLOY_TYPE=$DEPLOY_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -462,6 +474,10 @@
default: 'xerces-jumphost-onap-ubuntu1804'
description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
- string:
+ name: OPENSTACK_CLOUD_PROVIDER
+ default: 'city'
+ description: 'Name of the cloud where this job is run'
+ - string:
name: DISTRO
default: 'ubuntu1804'
description: 'Distribution to use for configuring target nodes (networking etc.)'
@@ -483,10 +499,6 @@
description: 'Type of the deployment'
wrappers:
- - credentials-binding:
- - file:
- credential-id: est-jenkins-openrcfile-city-karlskrona-onap
- variable: OPENRC_FILE
- mask-passwords
- build-timeout:
timeout: '{build-timeout}'
@@ -502,7 +514,7 @@
builders:
- description-setter:
- description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
+ description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER
- '{onap-other-phases}-macro'
- job-template:
@@ -526,6 +538,10 @@
default: 'xerces-jumphost-onap-ubuntu1804'
description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
- string:
+ name: OPENSTACK_CLOUD_PROVIDER
+ default: 'city'
+ description: 'Name of the cloud where this job is run'
+ - string:
name: DISTRO
default: 'ubuntu1804'
description: 'Distribution to use for configuring target nodes (networking etc.)'
@@ -563,10 +579,6 @@
description: 'Development purposes only! Set to none for disabling test results DB reporting.'
wrappers:
- - credentials-binding:
- - file:
- credential-id: est-jenkins-openrcfile-city-karlskrona-onap
- variable: OPENRC_FILE
- mask-passwords
- build-timeout:
timeout: '{build-timeout}'
@@ -582,7 +594,7 @@
builders:
- description-setter:
- description: $DEPLOY_SCENARIO | $ONAP_FLAVOR
+ description: $DEPLOY_SCENARIO | $ONAP_FLAVOR | $OPENSTACK_CLOUD_PROVIDER
- 'onap-healthcheck-macro'
# vim: set ts=2 sw=2 expandtab: