diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/compass4nfv/compass-ci-jobs.yml | 1 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 5 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-project-jobs.yml | 1 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass-verify-jobs.yml | 1 | ||||
| -rwxr-xr-x | jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh | 21 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-download-artifact.sh | 4 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 10 | ||||
| -rw-r--r-- | jjb/vswitchperf/vswitchperf.yml | 22 |
8 files changed, 48 insertions, 17 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml index eb9113114..b70bfc67b 100644 --- a/jjb/compass4nfv/compass-ci-jobs.yml +++ b/jjb/compass4nfv/compass-ci-jobs.yml @@ -248,6 +248,7 @@ name: COMPASS_OPENSTACK_VERSION choices: - 'mitaka' + - 'newton' - 'liberty' - choice: name: COMPASS_OS_VERSION_OPTION diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 65e44b670..256717953 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -33,6 +33,11 @@ if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${COMPASS_OS_VERSION_OPTION} export OS_VERSION=${COMPASS_OS_VERSION_OPTION} fi +if [[ "${OPENSTACK_VERSION}" = "newton" ]]; then + export OS_VERSION="xenial" + export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${OS_VERSION} +fi + if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]; then export NETWORK_CONF_FILE=network_ocl.yml diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml index 3a52e91c9..50ff072fb 100644 --- a/jjb/compass4nfv/compass-project-jobs.yml +++ b/jjb/compass4nfv/compass-project-jobs.yml @@ -125,6 +125,7 @@ name: COMPASS_OPENSTACK_VERSION choices: - 'mitaka' + - 'newton' - 'liberty' - choice: name: COMPASS_OS_VERSION diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml index 82e3dfdf2..87c19a9c5 100644 --- a/jjb/compass4nfv/compass-verify-jobs.yml +++ b/jjb/compass4nfv/compass-verify-jobs.yml @@ -243,6 +243,7 @@ name: COMPASS_OPENSTACK_VERSION choices: - 'mitaka' + - 'newton' - 'liberty' - choice: name: COMPASS_OS_VERSION diff --git a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh index 8936be6c4..9de494fc2 100755 --- a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh +++ b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh @@ -4,3 +4,24 @@ echo "--------------------------------------------------------" echo "This is diasy4nfv virtual deploy job!" echo "--------------------------------------------------------" +cd $WORKSPACE + +if [[ "$NODE_NAME" =~ "-virtual" ]]; then + export NETWORK_CONF=./deploy/config/vm_environment/$NODE_NAME/network.yml + export DHA_CONF=./deploy/config/vm_environment/$NODE_NAME/deploy.yml +else + exit 1 +fi + +./ci/deploy/deploy.sh ${DHA_CONF} ${NETWORK_CONF} + +if [ $? -ne 0 ]; then + echo "depolyment failed!" + deploy_ret=1 +fi + +echo +echo "--------------------------------------------------------" +echo "Done!" + +exit $deploy_ret diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh index 3f691d821..fd824ca44 100755 --- a/jjb/fuel/fuel-download-artifact.sh +++ b/jjb/fuel/fuel-download-artifact.sh @@ -16,11 +16,11 @@ set -o pipefail if [[ "$JOB_NAME" =~ "merge" ]]; then echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties" # get the properties file for the Fuel ISO built for a merged change - curl -s -o $WORKSPACE/latest.properties http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties + curl -L -s -o $WORKSPACE/latest.properties http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties else # get the latest.properties file in order to get info regarding latest artifact echo "Downloading http://$GS_URL/latest.properties" - curl -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties + curl -L -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties fi # check if we got the file diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index ec0b86170..55f4769b7 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -59,7 +59,7 @@ parameters: - string: name: INSTALLER_IP - default: '192.168.Y.Y' + default: '192.168.122.5' description: 'IP of the installer' - string: name: INSTALLER_TYPE @@ -67,11 +67,11 @@ description: 'Installer used for deploying OPNFV on this POD' - string: name: OS_RELEASE - default: 'mitaka' - description: 'OpenStack release (liberty|mitaka)' + default: 'newton' + description: 'OpenStack release (mitaka|newton)' - string: name: EXTERNAL_NETWORK - default: ext-net4 + default: ext-net description: "External network used for Floating ips." - string: name: LAB_CONFIG @@ -84,7 +84,7 @@ - string: name: UBUNTU_DISTRO default: 'xenial' - description: "Ubuntu distribution to use for Openstack (trusty|xenial)" + description: "Ubuntu distribution to use for Openstack (xenial)" - string: name: CPU_ARCHITECTURE default: 'amd64' diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml index 3f7f6bf2d..5f952de00 100644 --- a/jjb/vswitchperf/vswitchperf.yml +++ b/jjb/vswitchperf/vswitchperf.yml @@ -63,11 +63,12 @@ concurrent: true properties: - - throttle: - enabled: true - max-total: 3 - max-per-node: 2 - option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'vswitchperf-verify-.*' + - 'vswitchperf-merge-.*' + block-level: 'NODE' parameters: - project-parameter: @@ -125,11 +126,12 @@ concurrent: true properties: - - throttle: - enabled: true - max-total: 3 - max-per-node: 2 - option: 'project' + - build-blocker: + use-build-blocker: true + blocking-jobs: + - 'vswitchperf-verify-.*' + - 'vswitchperf-merge-.*' + block-level: 'NODE' parameters: - project-parameter: |