summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml29
-rw-r--r--jjb/compass4nfv/compass-deploy.sh3
-rwxr-xr-xjjb/fuel/fuel-deploy.sh29
-rw-r--r--jjb/yardstick/yardstick-ci-jobs.yml6
-rwxr-xr-xjjb/yardstick/yardstick-daily.sh2
-rwxr-xr-xutils/gpg_import_key.sh31
6 files changed, 85 insertions, 15 deletions
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 52d678554..6bfc73778 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -60,6 +60,9 @@
- 'os-ocl-nofeature-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-onos-sfc-ha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
jobs:
- 'compass-{scenario}-{pod}-daily-{stream}'
@@ -217,6 +220,11 @@
choices:
- 'mitaka'
- 'liberty'
+ - choice:
+ name: COMPASS_OS_VERSION_OPTION
+ choices:
+ - ''
+ - 'xenial'
########################
# trigger macros
@@ -241,6 +249,10 @@
name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-onos-sfc-ha-huawei-pod2-master-trigger'
+ triggers:
+ - timed: ''
- trigger:
name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
@@ -262,6 +274,10 @@
name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
triggers:
- timed: '0 9 * * *'
+- trigger:
+ name: 'compass-os-onos-sfc-ha-baremetal-master-trigger'
+ triggers:
+ - timed: ''
- trigger:
name: 'compass-os-nosdn-nofeature-ha-baremetal-brahmaputra-trigger'
@@ -283,6 +299,10 @@
name: 'compass-os-ocl-nofeature-ha-baremetal-brahmaputra-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-onos-sfc-ha-baremetal-brahmaputra-trigger'
+ triggers:
+ - timed: ''
- trigger:
name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
@@ -305,6 +325,11 @@
triggers:
- timed: '0 9 * * *'
- trigger:
+ name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
+ triggers:
+ - timed: ''
+
+- trigger:
name: 'compass-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
@@ -324,3 +349,7 @@
name: 'compass-os-ocl-nofeature-ha-virtual-brahmaputra-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'compass-os-onos-sfc-ha-virtual-brahmaputra-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 68a93a15b..025984990 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -46,6 +46,9 @@ cd $WORKSPACE
export OS_VERSION=${COMPASS_OS_VERSION}
export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
+if [[ "${COMPASS_OS_VERSION_OPTION}" = "xenial" ]] && [[ "${OPENSTACK_VERSION}" = "mitaka" ]]; then
+ export OPENSTACK_VERSION=${OPENSTACK_VERSION}_${OS_VERSION}
+fi
./deploy.sh --dha ${DHA_CONF} --network ${NETWORK_CONF}
if [ $? -ne 0 ]; then
echo "depolyment failed!"
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 14d48e789..c30041711 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -7,7 +7,6 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-set -o errexit
set -o nounset
set -o pipefail
@@ -57,10 +56,16 @@ chmod a+x $TMPDIR
# clone the securedlab repo
cd $WORKSPACE
echo "Cloning securedlab repo ${GIT_BRANCH##origin/}"
-git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet --branch ${GIT_BRANCH##origin/}
+git clone ssh://jenkins-ericsson@gerrit.opnfv.org:29418/securedlab --quiet \
+ --branch ${GIT_BRANCH##origin/}
+
+# log file name
+FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
# construct the command
-DEPLOY_COMMAND="sudo $WORKSPACE/ci/deploy.sh -b file://$WORKSPACE/securedlab -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://$WORKSPACE/opnfv.iso -H -B $BRIDGE -S $TMPDIR"
+DEPLOY_COMMAND="sudo $WORKSPACE/ci/deploy.sh -b file://$WORKSPACE/securedlab \
+ -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://$WORKSPACE/opnfv.iso \
+ -H -B $BRIDGE -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME"
# log info to console
echo "Deployment parameters"
@@ -80,10 +85,26 @@ echo "$DEPLOY_COMMAND"
echo
$DEPLOY_COMMAND
+exit_code=$?
echo
echo "--------------------------------------------------------"
-echo "Deployment is done successfully!"
+echo "Deployment is done!"
+
+# upload logs for baremetal deployments
+# work with virtual deployments is still going on so we skip that for the timebeing
+if [[ "$JOB_NAME" =~ "baremetal-daily" ]]; then
+ echo "Uploading deployment logs"
+ gsutil cp $WORKSPACE/$FUEL_LOG_FILENAME gs://$GS_URL/logs/$FUEL_LOG_FILENAME > /dev/null 2>&1
+ echo "Logs are available as http://$GS_URL/logs/$FUEL_LOG_FILENAME"
+fi
+
+if [[ $exit_code -ne 0 ]]; then
+ echo "Deployment failed!"
+ exit $exit_code
+else
+ echo "Deployment is successful!"
+fi
# Quick and dirty fix for SFC scenatio - will be fixed properly post-release
if [[ ! "$DEPLOY_SCENARIO" =~ "os-odl_l2-sfc" ]]; then
diff --git a/jjb/yardstick/yardstick-ci-jobs.yml b/jjb/yardstick/yardstick-ci-jobs.yml
index 21a6b80b0..6b922889a 100644
--- a/jjb/yardstick/yardstick-ci-jobs.yml
+++ b/jjb/yardstick/yardstick-ci-jobs.yml
@@ -188,9 +188,9 @@
default: '{docker-tag}'
description: 'Tag to pull docker image'
- string:
- name: YARDSTICK_SUITE_NAME
- default: opnfv_${{NODE_NAME}}_{testsuite}.yaml
- description: 'Path to test suite'
+ name: YARDSTICK_SCENARIO_SUITE_NAME
+ default: opnfv_${{DEPLOY_SCENARIO}}_{testsuite}.yaml
+ description: 'Path to test scenario suite'
- string:
name: CI_DEBUG
default: 'false'
diff --git a/jjb/yardstick/yardstick-daily.sh b/jjb/yardstick/yardstick-daily.sh
index 176f1b985..e8df9be58 100755
--- a/jjb/yardstick/yardstick-daily.sh
+++ b/jjb/yardstick/yardstick-daily.sh
@@ -33,7 +33,7 @@ docker pull opnfv/yardstick:$DOCKER_TAG >$redirect
# Run docker
cmd="sudo docker run ${opts} ${envs} ${labconfig} ${sshkey} opnfv/yardstick \
- exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SUITE_NAME}"
+ exec_tests.sh ${YARDSTICK_DB_BACKEND} ${YARDSTICK_SCENARIO_SUITE_NAME}"
echo "Yardstick: Running docker cmd: ${cmd}"
${cmd}
diff --git a/utils/gpg_import_key.sh b/utils/gpg_import_key.sh
index 80b7c397e..bb11f0d45 100755
--- a/utils/gpg_import_key.sh
+++ b/utils/gpg_import_key.sh
@@ -7,15 +7,32 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-
function isinstalled {
-if rpm -q "$@" >/dev/null 2>&1; then
- true
- else
- echo installing "$1"
- sudo yum install "$1"
- false
+
+source /etc/os-release; echo ${ID/*, /}
+
+if [[ ${ID/*, /} =~ "centos" ]]; then
+ if rpm -q "$@" >/dev/null 2>&1; then
+ true
+ else
+ echo installing "$1"
+ sudo yum install "$1"
+ false
+ fi
+
+elif [[ ${ID/*, /} =~ "ubuntu" ]]; then
+ if dpkg-query -W -f'${Status}' "$@" 2>/dev/null | grep -q "ok installed"; then
+ true
+ else
+ echo installing "$1"
+ sudo apt-get install -y "$1"
+ false
+ fi
+else
+ echo "Distro not supported"
+ exit 0
fi
+
}
if ! isinstalled gnupg2; then