summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xjjb/armband/armband-deploy.sh15
-rwxr-xr-xjjb/daisy4nfv/daisy4nfv-virtual-deploy.sh4
-rw-r--r--jjb/doctor/doctor.yml78
-rw-r--r--jjb/global/installer-params.yml (renamed from jjb/opnfv/installer-params.yml)0
-rw-r--r--jjb/global/releng-defaults.yml (renamed from jjb/releng-defaults.yaml)0
-rw-r--r--jjb/global/releng-macros.yml (renamed from jjb/releng-macros.yaml)0
-rw-r--r--jjb/global/slave-params.yml (renamed from jjb/opnfv/slave-params.yml)0
-rw-r--r--jjb/releng/artifact-cleanup.yml (renamed from jjb/opnfv/artifact-cleanup.yml)0
-rw-r--r--jjb/releng/opnfv-docker.sh (renamed from jjb/opnfv/opnfv-docker.sh)0
-rw-r--r--jjb/releng/opnfv-docker.yml (renamed from jjb/opnfv/opnfv-docker.yml)0
-rw-r--r--jjb/releng/opnfv-docs.yml (renamed from jjb/opnfv/opnfv-docs.yml)0
-rw-r--r--jjb/releng/opnfv-lint.yml (renamed from jjb/opnfv/opnfv-lint.yml)0
-rw-r--r--jjb/releng/opnfv-utils.yml (renamed from jjb/opnfv/opnfv-utils.yml)0
-rwxr-xr-xjjb/releng/verify-releng.sh2
14 files changed, 62 insertions, 37 deletions
diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh
index e0631c424..4df9acfd8 100755
--- a/jjb/armband/armband-deploy.sh
+++ b/jjb/armband/armband-deploy.sh
@@ -71,10 +71,23 @@ ISO_FILE=$WORKSPACE/opnfv.iso
# log file name
FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
+# Deploy Cache (to enable just create the deploy-cache subdir)
+# NOTE: Only available when ISO files are cached using ISOSTORE mechanism
+DEPLOY_CACHE=${ISOSTORE:-/iso_mount/opnfv_ci}/${GIT_BRANCH##*/}/deploy-cache
+if [[ -d "${DEPLOY_CACHE}" ]]; then
+ echo "Deploy cache dir present."
+ echo "--------------------------------------------------------"
+ echo "Fuel@OPNFV deploy cache: ${DEPLOY_CACHE}"
+ DEPLOY_CACHE="-C ${DEPLOY_CACHE}"
+else
+ DEPLOY_CACHE=""
+fi
+
# construct the command
DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \
-l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \
- -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME"
+ -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
+ ${DEPLOY_CACHE}"
# log info to console
echo "Deployment parameters"
diff --git a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh
index 9de494fc2..4aa7b0bd5 100755
--- a/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh
+++ b/jjb/daisy4nfv/daisy4nfv-virtual-deploy.sh
@@ -10,7 +10,9 @@ 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
+ # TODO: For the time being, we need to pass this script to let contributors merge their work.
+ echo "No support for non-virtual node"
+ exit 0
fi
./ci/deploy/deploy.sh ${DHA_CONF} ${NETWORK_CONF}
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index 4958ca2b5..dfce40202 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -7,12 +7,12 @@
- master:
branch: '{stream}'
gs-pathname: ''
- docker_tag: 'master'
+ docker-tag: 'master'
disabled: false
- colorado:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- docker_tag: 'stable'
+ docker-tag: 'stable'
disabled: false
installer:
@@ -20,9 +20,13 @@
slave-label: 'ool-virtual1'
pod: 'ool-virtual1'
+ inspector:
+ - 'sample'
+ - 'congress'
+
jobs:
- 'doctor-verify-{stream}'
- - 'doctor-verify-{installer}-{stream}'
+ - 'doctor-verify-{installer}-{inspector}-{stream}'
- job-template:
name: 'doctor-verify-{stream}'
@@ -68,7 +72,7 @@
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
- job-template:
- name: 'doctor-verify-{installer}-{stream}'
+ name: 'doctor-verify-{installer}-{inspector}-{stream}'
node: '{slave-label}'
@@ -81,7 +85,41 @@
name: OS_CREDS
default: /home/jenkins/openstack.creds
description: 'OpenStack credentials'
+ - '{installer}-defaults'
- '{slave-label}-defaults'
+ # functest
+ - string:
+ name: DOCKER_TAG
+ default: '{docker-tag}'
+ description: 'Tag to pull docker image'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-ha'
+ # functest-suite-parameter
+ - string:
+ name: FUNCTEST_SUITE_NAME
+ default: '{project}'
+ - string:
+ name: TESTCASE_OPTIONS
+ default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/doctor'
+ description: 'Addtional parameters specific to test case(s)'
+ # functest-parameter
+ - string:
+ name: GS_PATHNAME
+ default: '{gs-pathname}'
+ description: "Version directory where the opnfv documents will be stored in gs repository"
+ - string:
+ name: FUNCTEST_REPO_DIR
+ default: "/home/opnfv/repos/functest"
+ description: "Directory where the Functest repository is cloned"
+ - string:
+ name: PUSH_RESULTS_TO_DB
+ default: "true"
+ description: "Push the results of all the tests to the resultDB"
+ - string:
+ name: CI_DEBUG
+ default: 'true'
+ description: "Show debug output information"
scm:
- gerrit-trigger-scm:
@@ -117,36 +155,8 @@
notbuilt: true
builders:
- - trigger-builds:
- - project: 'functest-{installer}-{pod}-suite-{stream}'
- current-parameters: true
- predefined-parameters: |
- CI_DEBUG=true
- FUNCTEST_SUITE_NAME=doctor
- DEPLOY_SCENARIO=os-nosdn-nofeature-ha
- TESTCASE_OPTIONS=-e INSPECTOR_TYPE=sample -v $WORKSPACE:$HOME/opnfv/repos/doctor
- block: true
- same-node: true
- - project: 'functest-{installer}-{pod}-suite-{stream}'
- current-parameters: true
- predefined-parameters: |
- CI_DEBUG=true
- FUNCTEST_SUITE_NAME=doctor
- DEPLOY_SCENARIO=os-nosdn-nofeature-ha
- TESTCASE_OPTIONS=-e INSPECTOR_TYPE=congress -v $WORKSPACE:$HOME/opnfv/repos/doctor
- block: true
- same-node: true
+ - 'functest-suite-builder'
publishers:
- - postbuildscript:
- builders:
- - functest-copy-suite-log:
- suite: '{project}'
- archive:
- artifacts: '{project}.log'
-
-- builder:
- name: functest-copy-suite-log
- builders:
- - shell: |
- cp $HOME/opnfv/functest/results/${{GIT_BRANCH##*/}}/{suite}.log $WORKSPACE/
+ artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log'
diff --git a/jjb/opnfv/installer-params.yml b/jjb/global/installer-params.yml
index 55f4769b7..55f4769b7 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/global/installer-params.yml
diff --git a/jjb/releng-defaults.yaml b/jjb/global/releng-defaults.yml
index bf3330657..bf3330657 100644
--- a/jjb/releng-defaults.yaml
+++ b/jjb/global/releng-defaults.yml
diff --git a/jjb/releng-macros.yaml b/jjb/global/releng-macros.yml
index 3afd355e6..3afd355e6 100644
--- a/jjb/releng-macros.yaml
+++ b/jjb/global/releng-macros.yml
diff --git a/jjb/opnfv/slave-params.yml b/jjb/global/slave-params.yml
index dd0c97996..dd0c97996 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/global/slave-params.yml
diff --git a/jjb/opnfv/artifact-cleanup.yml b/jjb/releng/artifact-cleanup.yml
index 1c609a4b2..1c609a4b2 100644
--- a/jjb/opnfv/artifact-cleanup.yml
+++ b/jjb/releng/artifact-cleanup.yml
diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh
index e0fbb7564..e0fbb7564 100644
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/releng/opnfv-docker.sh
diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 0df0ddf6f..0df0ddf6f 100644
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml
index 442e8ea71..442e8ea71 100644
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/releng/opnfv-docs.yml
diff --git a/jjb/opnfv/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index 652f28292..652f28292 100644
--- a/jjb/opnfv/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
diff --git a/jjb/opnfv/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml
index 717bb3cbc..717bb3cbc 100644
--- a/jjb/opnfv/opnfv-utils.yml
+++ b/jjb/releng/opnfv-utils.yml
diff --git a/jjb/releng/verify-releng.sh b/jjb/releng/verify-releng.sh
index 5c2dbff7a..682a8beda 100755
--- a/jjb/releng/verify-releng.sh
+++ b/jjb/releng/verify-releng.sh
@@ -8,7 +8,7 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
#test for non-ascii characters, these can pass the test and end up breaking things in production
-for x in $(find . -name *\.yml); do
+for x in $(find . -name *\.yml -or -name *\.yaml); do
if LC_ALL=C grep -q '[^[:print:][:space:]]' "$x"; then
echo "file "$x" contains non-ascii characters"