summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/apex/apex-snapshot-deploy.sh6
-rw-r--r--jjb/apex/apex.yaml132
-rw-r--r--jjb/apex/apex.yaml.j22
-rw-r--r--jjb/apex/scenarios.yaml.hidden13
-rw-r--r--jjb/auto/auto.yaml125
-rwxr-xr-xjjb/cperf/cperf-robot-netvirt-csit.sh7
-rw-r--r--jjb/doctor/doctor.yaml3
-rwxr-xr-xjjb/dovetail/dovetail-run.sh9
8 files changed, 124 insertions, 173 deletions
diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh
index 1e47c8297..bd023f558 100644
--- a/jjb/apex/apex-snapshot-deploy.sh
+++ b/jjb/apex/apex-snapshot-deploy.sh
@@ -25,10 +25,10 @@ pushd ci > /dev/null
sudo opnfv-clean
popd > /dev/null
-full_snap_url=http://$GS_URL/${OS_VERSION}/${TOPOLOGY}
+full_snap_url="gs://${GS_URL}/${OS_VERSION}/${TOPOLOGY}"
echo "Downloading latest snapshot properties file"
-if ! wget -O $WORKSPACE/opnfv.properties ${full_snap_url}/snapshot.properties; then
+if ! gsutil cp ${full_snap_url}/snapshot.properties $WORKSPACE/opnfv.properties; then
echo "ERROR: Unable to find snapshot.properties at ${full_snap_url}...exiting"
exit 1
fi
@@ -68,7 +68,7 @@ if [ "$local_snap_checksum" != "$latest_snap_checksum" ]; then
echo "INFO: SHA mismatch, will download latest snapshot"
# wipe cache
rm -rf ${SNAP_CACHE}/*
- wget --directory-prefix=${SNAP_CACHE}/ ${snap_url}
+ gsutil cp "gs://${snap_url}" ${SNAP_CACHE}/
snap_tar=$(basename ${snap_url})
else
snap_tar=${latest_snap}
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml
index 84e29e95f..92681ffcd 100644
--- a/jjb/apex/apex.yaml
+++ b/jjb/apex/apex.yaml
@@ -37,7 +37,7 @@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-nosdn-nofeature-ha'
scenario_stream: 'fraser'
- disable_daily: true
+ disable_daily: false
disable_promote: true
- euphrates: &euphrates
branch: 'stable/euphrates'
@@ -62,36 +62,10 @@
disable_promote: true
scenario:
- - 'os-nosdn-nofeature-noha':
- <<: *fraser
- 'os-nosdn-nofeature-ha':
<<: *fraser
- - 'os-odl-nofeature-ha':
- <<: *fraser
- - 'os-odl-nofeature-noha':
- <<: *fraser
- 'os-odl-bgpvpn-ha':
<<: *fraser
- - 'os-ovn-nofeature-noha':
- <<: *fraser
- - 'os-nosdn-fdio-noha':
- <<: *fraser
- - 'os-nosdn-fdio-ha':
- <<: *fraser
- - 'os-nosdn-bar-ha':
- <<: *fraser
- - 'os-nosdn-bar-noha':
- <<: *fraser
- - 'os-nosdn-ovs_dpdk-noha':
- <<: *fraser
- - 'os-nosdn-ovs_dpdk-ha':
- <<: *fraser
- - 'os-odl-sfc-noha':
- <<: *fraser
- - 'os-odl-sfc-ha':
- <<: *fraser
- - 'os-nosdn-calipso-noha':
- <<: *fraser
- 'os-nosdn-nofeature-noha':
<<: *danube
- 'os-nosdn-nofeature-ha':
@@ -1193,14 +1167,6 @@
name: Baremetal Deploy and Test Phase
condition: SUCCESSFUL
projects:
- - name: 'apex-os-nosdn-nofeature-noha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser'
node-parameters: false
current-parameters: false
@@ -1209,22 +1175,6 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-odl-nofeature-ha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-nofeature-noha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- name: 'apex-os-odl-bgpvpn-ha-baremetal-fraser'
node-parameters: false
current-parameters: false
@@ -1233,86 +1183,6 @@
kill-phase-on: NEVER
abort-all-job: true
git-revision: false
- - name: 'apex-os-ovn-nofeature-noha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-fdio-noha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-fdio-ha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-bar-ha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-bar-noha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-sfc-noha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-odl-sfc-ha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
- - name: 'apex-os-nosdn-calipso-noha-baremetal-fraser'
- node-parameters: false
- current-parameters: false
- predefined-parameters: |
- OPNFV_CLEAN=yes
- kill-phase-on: NEVER
- abort-all-job: true
- git-revision: false
# danube Builder
- builder:
diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 4f424b6df..d72120055 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -37,7 +37,7 @@
baremetal-slave: 'apex-baremetal-master'
verify-scenario: 'os-nosdn-nofeature-ha'
scenario_stream: 'fraser'
- disable_daily: true
+ disable_daily: false
disable_promote: true
- euphrates: &euphrates
branch: 'stable/euphrates'
diff --git a/jjb/apex/scenarios.yaml.hidden b/jjb/apex/scenarios.yaml.hidden
index 3474fdbbb..ff1c18d6e 100644
--- a/jjb/apex/scenarios.yaml.hidden
+++ b/jjb/apex/scenarios.yaml.hidden
@@ -9,21 +9,8 @@ master:
- 'os-odl-queens-ha'
- 'k8s-nosdn-nofeature-noha'
fraser:
- - 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
- - 'os-odl-nofeature-ha'
- - 'os-odl-nofeature-noha'
- 'os-odl-bgpvpn-ha'
- - 'os-ovn-nofeature-noha'
- - 'os-nosdn-fdio-noha'
- - 'os-nosdn-fdio-ha'
- - 'os-nosdn-bar-ha'
- - 'os-nosdn-bar-noha'
- - 'os-nosdn-ovs_dpdk-noha'
- - 'os-nosdn-ovs_dpdk-ha'
- - 'os-odl-sfc-noha'
- - 'os-odl-sfc-ha'
- - 'os-nosdn-calipso-noha'
euphrates:
- 'os-nosdn-nofeature-noha'
- 'os-nosdn-nofeature-ha'
diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml
index ee7208205..62f6ec29d 100644
--- a/jjb/auto/auto.yaml
+++ b/jjb/auto/auto.yaml
@@ -7,16 +7,15 @@
# -------------------------------
# BRANCH ANCHORS
# -------------------------------
- master: &master
- stream: master
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
- fraser: &fraser
- stream: fraser
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
+ stream:
+ - master:
+ branch: '{stream}'
+ gs-pathname: ''
+ disabled: false
+ - fraser: &fraser
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
# -------------------------------
# DEPLOY TYPE ANCHORS
# -------------------------------
@@ -28,20 +27,9 @@
# -------------------------------
# CI POD's
# -------------------------------
- # fraser
- # -------------------------------
pod:
- # yamllint disable rule:key-duplicates
- - auto-baremetal:
- <<: *baremetal
- <<: *fraser
- # -------------------------------
- # master
- # -------------------------------
- auto-baremetal:
<<: *baremetal
- <<: *master
- # yamllint enable rule:key-duplicates
# -------------------------------
# scenarios
# -------------------------------
@@ -53,7 +41,8 @@
jobs:
- '{installer}-{scenario}-{pod}-auto-daily-{stream}'
- '{installer}-deploy-{pod}-daily-{stream}'
- - '{project}-verify-basic'
+ - 'auto-verify-{stream}'
+ - 'auto-merge-{stream}'
########################
# job templates
@@ -107,6 +96,98 @@
same-node: true
block: true
+- job-template:
+ name: 'auto-verify-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ project-type: freestyle
+
+ concurrent: true
+
+ properties:
+ - logrotate-default
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
+
+ scm:
+ - git-scm-gerrit
+
+ triggers:
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - patchset-created-event:
+ exclude-drafts: 'false'
+ exclude-trivial-rebase: 'false'
+ exclude-no-code-change: 'false'
+ - draft-published-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**'
+
+ builders:
+ - shell: |
+ pwd
+ ./ci/build-auto.sh verify
+
+- job-template:
+ name: 'auto-merge-{stream}'
+
+ disabled: '{obj:disabled}'
+
+ project-type: freestyle
+
+ concurrent: true
+
+ properties:
+ - logrotate-default
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - 'opnfv-build-ubuntu-defaults'
+
+ scm:
+ - git-scm
+
+ triggers:
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: 'remerge'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '{project}'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ forbidden-file-paths:
+ - compare-type: ANT
+ pattern: 'docs/**'
+
+ builders:
+ - shell: |
+ pwd
+ ./ci/build-auto.sh merge
+
########################
# trigger macros
########################
diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh
index 3d943e1be..71508b005 100755
--- a/jjb/cperf/cperf-robot-netvirt-csit.sh
+++ b/jjb/cperf/cperf-robot-netvirt-csit.sh
@@ -93,6 +93,7 @@ robot_cmd="pybot \
-v ODL_STREAM:$ODL_STREAM \
-v ODL_SYSTEM_IP:$CONTROLLER_1_IP \
-v OS_CONTROL_NODE_IP:$CONTROLLER_1_IP \
+ -v OS_DEPLOY="0cmb-1ctl-2cmp" \
-v OPENSTACK_BRANCH:$FULL_OS_VER \
-v OS_USER:heat-admin \
-v ODL_ENABLE_L3_FWD:yes \
@@ -114,6 +115,9 @@ robot_cmd="pybot \
$EXTRA_ROBOT_ARGS \
-v of_port:6653 "
+suites="/home/opnfv/repos/odl_test/csit/suites/openstack/connectivity/l2.robot \
+ /home/opnfv/repos/odl_test/csit/suites/openstack/connectivity/l3.robot"
+
echo "Robot command set: ${robot_cmd}"
echo "Running robot..."
docker run -i --net=host \
@@ -122,7 +126,8 @@ docker run -i --net=host \
-v ${WORKSPACE}/overcloudrc:/tmp/overcloudrc \
opnfv/cperf:$DOCKER_TAG \
/bin/bash -c "source /tmp/overcloudrc; mkdir -p \$HOME/.ssh; cp /tmp/id_rsa \$HOME/.ssh; \
- $robot_cmd /home/opnfv/repos/odl_test/csit/suites/openstack/connectivity/l2.robot;"
+ cd /home/opnfv/repos/odl_test/ && git pull origin master; \
+ ${robot_cmd} ${suites};"
UPLOAD_LOCATION=artifacts.opnfv.org/cperf/cperf-apex-csit-${ODL_BRANCH}/${BUILD_NUMBER}/
echo "Uploading robot logs to ${UPLOAD_LOCATION}"
diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index 051beb8b4..e91911194 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -200,7 +200,8 @@
source $HOME/opnfv-installer.sh
# run tox to trigger the test
- tox -e py34
+ # As Jenkins user, it has no permission to send ICMP package
+ sudo -E tox -e py34
# -------------------------------
# publisher macros
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 0f88e843d..2797ec5ff 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -372,11 +372,18 @@ else
testarea="--testarea ${TESTAREA}"
fi
-run_cmd="dovetail run ${testsuite} ${testarea} -d"
+run_cmd="dovetail run ${testsuite} ${testarea} -d -r"
echo "Container exec command: ${run_cmd}"
docker exec $container_id ${run_cmd}
sudo cp -r ${DOVETAIL_HOME}/results ./
+result_package=$(find ${DOVETAIL_HOME} -name 'logs_*')
+echo "Results package is ${result_package}"
+for item in ${result_package};
+do
+ sudo mv ${item} ./results
+done
+
# To make sure the file owner is the current user, for the copied results files in the above line
echo "Change owner of result files ..."
CURRENT_USER=${SUDO_USER:-$USER}