summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/airship/airship.yaml77
-rw-r--r--jjb/airship/cntt.yaml668
-rw-r--r--jjb/ci_gate_security/opnfv-ci-gate-security.yaml1
-rw-r--r--jjb/doctor/doctor.yaml42
-rwxr-xr-xjjb/dovetail/dovetail-run.sh5
-rw-r--r--jjb/functest/functest-docker.yaml24
-rw-r--r--jjb/functest/functest-kubernetes-project-jobs.yaml203
-rw-r--r--jjb/functest/functest-kubernetes.yaml15
-rw-r--r--jjb/functest/functest-project-jobs.yaml197
-rw-r--r--jjb/functest/functest-rtd-jobs.yaml24
-rw-r--r--jjb/functest/functest.yaml191
-rw-r--r--jjb/functest/xtesting-project-jobs.yaml203
-rw-r--r--jjb/functest/xtesting.yaml15
-rw-r--r--jjb/global/releng-macros.yaml11
-rw-r--r--jjb/global/slave-params.yaml4
-rw-r--r--jjb/laas/laas.yml (renamed from jjb/pharos/pharos-tools.yml)24
-rw-r--r--jjb/laas/shell/backup-dashboard.sh (renamed from jjb/pharos/shell/backup-dashboard.sh)12
-rw-r--r--jjb/laas/shell/deploy-dashboard.sh (renamed from jjb/pharos/shell/deploy-dashboard.sh)4
-rw-r--r--jjb/releng/opnfv-docker.yaml18
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yaml44
-rw-r--r--tox.ini3
21 files changed, 1164 insertions, 621 deletions
diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 49ea4fa..0f903af 100644
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -20,6 +20,26 @@
name: slave
default: '{slave}'
+- parameter:
+ name: airship-build_tag
+ parameters:
+ - random-string:
+ name: build_tag
+
+- parameter:
+ name: airship-DEBUG
+ parameters:
+ - string:
+ name: DEBUG
+ default: 'true'
+
+- parameter:
+ name: airship-EXTERNAL_NETWORK
+ parameters:
+ - string:
+ name: EXTERNAL_NETWORK
+ default: public
+
- airship-containers: &airship-containers
name: 'airship-containers'
repo: '{repo}'
@@ -50,7 +70,7 @@
name: airship-run-containers
builders:
- shell: |
- set +ex
+ set +x
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
image={container}:{functest_tag}
@@ -60,24 +80,24 @@
image={repo}:{port}/{container}:{functest_tag}
fi
sudo docker run --rm \
+ -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+ -e S3_DST_URL=s3://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID \
+ -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID \
-e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
- -e NODE_NAME=intel-pod17 \
+ -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+ -e NODE_NAME=$slave \
-e INSTALLER_TYPE=airship \
+ -e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
- -e DEBUG=True \
- -e EXTERNAL_NETWORK=public \
+ -v /home/opnfv/functest/.boto:/root/.boto \
+ -e DEBUG=$DEBUG \
+ -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
+ -e DEPLOY_SCENARIO=os-nosdn-nofeature-ha \
-v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-v /home/opnfv/functest/images:/home/opnfv/functest/images \
-v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python2.7/\
site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \
- $image run_tests -t {test} -r
- res=$?
- gsutil -m cp -r $WORKSPACE/ \
- gs://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
- find $WORKSPACE -type f \
- -printf \
- "http://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID/%P\n"
- exit $res
+ $image run_tests -t {test} -r -p
- builder:
name: airship-remove-images
@@ -99,7 +119,7 @@
- shell: |
set +x
export TERM_OPTS=" "
- sudo -H -E -u ubuntu bash -c 'tools/deploy.sh deploy_site'
+ sudo -H -E -u ubuntu bash -c 'tools/deploy.sh $slave deploy_site'
- scm:
name: airship-scm
@@ -227,6 +247,12 @@
parameters:
- airship-slave:
slave: '{slave}'
+ - airship-build_tag:
+ build_tag: ''
+ - airship-DEBUG:
+ DEBUG: 'true'
+ - airship-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
builders:
- airship-run-containers:
<<: *airship-run-containers
@@ -257,10 +283,13 @@
container: 'functest-smoke'
test:
- neutron-tempest-plugin-api
+ - tempest_cinder
+ - tempest_keystone
- rally_sanity
- refstack_defcore
- tempest_full
- tempest_scenario
+ - tempest_slow
- patrole
- neutron_trunk
- networking-bgpvpn
@@ -302,8 +331,14 @@
parameters:
- airship-slave:
slave: '{slave}'
+ - airship-build_tag:
+ build_tag: ''
- airship-branch:
branch: 'master'
+ - airship-DEBUG:
+ DEBUG: 'true'
+ - airship-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
properties:
- build-blocker:
use-build-blocker: true
@@ -314,7 +349,7 @@
- multijob:
name: deploy
projects:
- - name: 'airship-deploy-daily-latest'
+ - name: 'airship-deploy-daily-{tag}'
<<: *airship-jobs
- multijob:
name: remove former images
@@ -372,6 +407,10 @@
projects:
- name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
<<: *airship-jobs
+ - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_cinder-run'
+ <<: *airship-jobs
+ - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_keystone-run'
+ <<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
<<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -380,6 +419,8 @@
<<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run'
<<: *airship-jobs
+ - name: 'airship-opnfv-functest-smoke-{tag}-tempest_slow-run'
+ <<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-patrole-run'
<<: *airship-jobs
- name: 'airship-opnfv-functest-smoke-{tag}-neutron_trunk-run'
@@ -450,6 +491,12 @@
parameters:
- airship-slave:
slave: '{slave}'
+ - airship-build_tag:
+ build_tag: ''
+ - airship-DEBUG:
+ DEBUG: 'true'
+ - airship-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
properties:
- build-blocker:
use-build-blocker: true
@@ -460,7 +507,7 @@
- multijob:
name: deploy
projects:
- - name: 'airship-deploy-gate-latest'
+ - name: 'airship-deploy-gate-{tag}'
<<: *airship-jobs
- multijob:
name: remove former images
diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
new file mode 100644
index 0000000..c2abc81
--- /dev/null
+++ b/jjb/airship/cntt.yaml
@@ -0,0 +1,668 @@
+---
+- cntt-jobs: &cntt-jobs
+ name: 'cntt-jobs'
+ current-parameters: true
+
+- cntt-params: &cntt-params
+ name: 'cntt-params'
+ repo: 'opnfv'
+ port:
+ tag:
+ - latest:
+ branch: master
+ slave: intel-pod10
+ functest_tag: hunter
+
+- parameter:
+ name: cntt-slave
+ parameters:
+ - label:
+ name: slave
+ default: '{slave}'
+
+- parameter:
+ name: cntt-build_tag
+ parameters:
+ - random-string:
+ name: build_tag
+
+- parameter:
+ name: cntt-DEBUG
+ parameters:
+ - string:
+ name: DEBUG
+ default: 'true'
+
+- parameter:
+ name: cntt-EXTERNAL_NETWORK
+ parameters:
+ - string:
+ name: EXTERNAL_NETWORK
+ default: public
+
+- cntt-containers: &cntt-containers
+ name: 'cntt-containers'
+ repo: '{repo}'
+ port: '{port}'
+ container: '{container}'
+ functest_tag: '{functest_tag}'
+
+- cntt-run-containers: &cntt-run-containers
+ name: 'cntt-run-containers'
+ <<: *cntt-containers
+ test: '{test}'
+
+- builder:
+ name: cntt-pull-containers
+ builders:
+ - shell: |
+ set +x
+ if [ "{repo}" = "_" ]; then
+ image={container}:{functest_tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{functest_tag}
+ else
+ image={repo}:{port}/{container}:{functest_tag}
+ fi
+ sudo docker pull $image
+
+- builder:
+ name: cntt-run-containers
+ builders:
+ - shell: |
+ set +x
+ [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+ if [ "{repo}" = "_" ]; then
+ image={container}:{functest_tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{functest_tag}
+ else
+ image={repo}:{port}/{container}:{functest_tag}
+ fi
+ sudo docker run --rm \
+ -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+ -e S3_DST_URL=s3://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID \
+ -e HTTP_DST_URL=http://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID \
+ -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+ -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+ -e NODE_NAME=$slave \
+ -e INSTALLER_TYPE=cntt \
+ -e BUILD_TAG=$BUILD_TAG \
+ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+ -v /home/opnfv/functest/.boto:/root/.boto \
+ -e DEBUG=$DEBUG \
+ -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
+ -e DEPLOY_SCENARIO=os-nosdn-nofeature-ha \
+ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
+ -v /home/opnfv/functest/images:/home/opnfv/functest/images \
+ -v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python2.7/\
+ site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \
+ $image run_tests -t {test} -r -p
+
+- builder:
+ name: cntt-remove-images
+ builders:
+ - shell: |
+ set +x
+ if [ "{repo}" = "_" ]; then
+ image={container}:{functest_tag}
+ elif [ "{port}" = "None" ]; then
+ image={repo}/{container}:{functest_tag}
+ else
+ image={repo}:{port}/{container}:{functest_tag}
+ fi
+ sudo docker rmi $image || true
+
+- builder:
+ name: cntt-deploy
+ builders:
+ - shell: |
+ set +x
+ export TERM_OPTS=" "
+ sudo -H -E -u opnfv bash -c 'tools/deploy.sh $slave deploy_site'
+
+- scm:
+ name: cntt-scm
+ scm:
+ - git:
+ url: https://gerrit.opnfv.org/gerrit/airship
+ refspec: '+refs/changes/*:refs/changes/*'
+ branches:
+ - '{ref}'
+
+- parameter:
+ name: cntt-branch
+ parameters:
+ - string:
+ name: branch
+ default: '{branch}'
+
+- job-template:
+ name: 'cntt-deploy-daily-{tag}'
+ parameters:
+ - cntt-slave:
+ slave: '{slave}'
+ - cntt-branch:
+ branch: '{branch}'
+ scm:
+ - cntt-scm:
+ ref: $branch
+ builders:
+ - cntt-deploy
+
+- job-template:
+ name: 'cntt-deploy-gate-{tag}'
+ parameters:
+ - cntt-slave:
+ slave: '{slave}'
+ scm:
+ - cntt-scm:
+ ref: $GERRIT_REFSPEC
+ builders:
+ - cntt-deploy
+
+- project:
+ name: 'cntt-deploy'
+ <<: *cntt-params
+ jobs:
+ - 'cntt-deploy-daily-{tag}'
+ - 'cntt-deploy-gate-{tag}'
+
+- job-template:
+ name: 'cntt-{repo}-{container}-{tag}-pull'
+ parameters:
+ - cntt-slave:
+ slave: '{slave}'
+ builders:
+ - cntt-pull-containers:
+ <<: *cntt-containers
+
+- project:
+ name: 'cntt-opnfv-functest-healthcheck-pull'
+ <<: *cntt-params
+ container: 'functest-healthcheck'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-pull'
+
+- project:
+ name: 'cntt-opnfv-functest-smoke-pull'
+ <<: *cntt-params
+ container: 'functest-smoke'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-pull'
+
+- project:
+ name: 'cntt-opnfv-functest-smoke-cntt-pull'
+ <<: *cntt-params
+ container: 'functest-smoke-cntt'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-pull'
+
+- project:
+ name: 'cntt-opnfv-functest-benchmarking-pull'
+ <<: *cntt-params
+ container: 'functest-benchmarking'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-pull'
+
+- project:
+ name: 'cntt-opnfv-functest-vnf-pull'
+ <<: *cntt-params
+ container: 'functest-vnf'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-pull'
+
+- job-template:
+ name: 'cntt-{repo}-{container}-{tag}-rmi'
+ parameters:
+ - cntt-slave:
+ slave: '{slave}'
+ builders:
+ - cntt-remove-images:
+ <<: *cntt-containers
+
+- project:
+ name: 'cntt-opnfv-functest-healthcheck-rmi'
+ <<: *cntt-params
+ container: 'functest-healthcheck'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-rmi'
+
+- project:
+ name: 'cntt-opnfv-functest-smoke-rmi'
+ <<: *cntt-params
+ container: 'functest-smoke'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-rmi'
+
+- project:
+ name: 'cntt-opnfv-functest-smoke-cntt-rmi'
+ <<: *cntt-params
+ container: 'functest-smoke-cntt'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-rmi'
+
+- project:
+ name: 'cntt-opnfv-functest-benchmarking-rmi'
+ <<: *cntt-params
+ container: 'functest-benchmarking'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-rmi'
+
+- project:
+ name: 'cntt-opnfv-functest-vnf-rmi'
+ <<: *cntt-params
+ container: 'functest-vnf'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-rmi'
+
+- job-template:
+ name: 'cntt-{repo}-{container}-{tag}-{test}-run'
+ parameters:
+ - cntt-slave:
+ slave: '{slave}'
+ - cntt-build_tag:
+ build_tag: ''
+ - cntt-DEBUG:
+ DEBUG: 'true'
+ - cntt-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ builders:
+ - cntt-run-containers:
+ <<: *cntt-run-containers
+
+- project:
+ name: 'cntt-opnfv-functest-healthcheck'
+ <<: *cntt-params
+ container: 'functest-healthcheck'
+ test:
+ - connection_check
+ - tenantnetwork1
+ - tenantnetwork2
+ - vmready1
+ - vmready2
+ - singlevm1
+ - singlevm2
+ - vping_ssh
+ - vping_userdata
+ - cinder_test
+ - odl
+ - tempest_smoke
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-{test}-run'
+
+- project:
+ name: 'cntt-opnfv-functest-smoke'
+ <<: *cntt-params
+ container: 'functest-smoke'
+ test:
+ - neutron-tempest-plugin-api
+ - tempest_cinder
+ - tempest_keystone
+ - rally_sanity
+ - refstack_defcore
+ - tempest_full
+ - tempest_scenario
+ - tempest_slow
+ - patrole
+ - neutron_trunk
+ - networking-bgpvpn
+ - networking-sfc
+ - barbican
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-{test}-run'
+
+- project:
+ name: 'cntt-opnfv-functest-smoke-cntt'
+ <<: *cntt-params
+ container: 'functest-smoke-cntt'
+ test:
+ - neutron-tempest-plugin-api
+ - tempest_cinder
+ - tempest_keystone
+ - rally_sanity
+ - tempest_full
+ - tempest_scenario
+ - tempest_slow
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-{test}-run'
+
+- project:
+ name: 'cntt-opnfv-functest-benchmarking'
+ <<: *cntt-params
+ container: 'functest-benchmarking'
+ test:
+ - rally_full
+ - rally_jobs
+ - vmtp
+ - shaker
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-{test}-run'
+
+- project:
+ name: 'cntt-opnfv-functest-vnf'
+ <<: *cntt-params
+ container: 'functest-vnf'
+ test:
+ - cloudify
+ - cloudify_ims
+ - heat_ims
+ - vyos_vrouter
+ - juju_epc
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-{test}-run'
+
+- job-template:
+ name: 'cntt-{tag}-daily'
+ project-type: multijob
+ triggers:
+ - timed: '@daily'
+ parameters:
+ - cntt-slave:
+ slave: '{slave}'
+ - cntt-build_tag:
+ build_tag: ''
+ - cntt-branch:
+ branch: 'master'
+ - cntt-DEBUG:
+ DEBUG: 'true'
+ - cntt-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ properties:
+ - build-blocker:
+ use-build-blocker: true
+ blocking-level: 'NODE'
+ blocking-jobs:
+ - '^cntt-{tag}-(daily|gate)$'
+ builders:
+ - multijob:
+ name: deploy
+ projects:
+ - name: 'cntt-deploy-daily-{tag}'
+ <<: *cntt-jobs
+ - multijob:
+ name: remove former images
+ projects:
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-rmi'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-rmi'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rmi'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-rmi'
+ <<: *cntt-jobs
+ - multijob:
+ name: pull containers
+ projects:
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-pull'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-pull'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-pull'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-pull'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-pull'
+ <<: *cntt-jobs
+ - multijob:
+ name: opnfv/functest-healthcheck:{functest_tag}
+ condition: ALWAYS
+ projects:
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-connection_check-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-vmready1-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-vmready2-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-singlevm1-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-singlevm2-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-vping_ssh-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-vping_userdata-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-cinder_test-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-odl-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
+ <<: *cntt-jobs
+ - multijob:
+ name: opnfv/functest-smoke:{functest_tag}
+ condition: ALWAYS
+ projects:
+ - name: 'cntt-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-rally_sanity-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-refstack_defcore-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_full-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_slow-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-patrole-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-neutron_trunk-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-networking-sfc-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-barbican-run'
+ <<: *cntt-jobs
+ - multijob:
+ name: opnfv/functest-smoke-cntt:{tag}
+ condition: ALWAYS
+ projects:
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+ <<: *cntt-jobs
+ - multijob:
+ name: opnfv/functest-benchmarking:{functest_tag}
+ condition: ALWAYS
+ projects:
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-rally_full-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-vmtp-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-shaker-run'
+ <<: *cntt-jobs
+ - multijob:
+ name: opnfv/functest-vnf:{functest_tag}
+ condition: ALWAYS
+ execution-type: SEQUENTIALLY
+ projects:
+ - name: 'cntt-opnfv-functest-vnf-{tag}-cloudify-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-cloudify_ims-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-heat_ims-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-juju_epc-run'
+ <<: *cntt-jobs
+
+- trigger:
+ name: cntt-patchset-created
+ triggers:
+ - gerrit:
+ server-name: 'gerrit.opnfv.org'
+ trigger-on:
+ - patchset-created-event
+ - comment-added-contains-event:
+ comment-contains-value: 'recheck'
+ - comment-added-contains-event:
+ comment-contains-value: 'reverify'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: 'airship'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ skip-vote:
+ successful: false
+ failed: false
+ unstable: false
+ notbuilt: false
+
+- job-template:
+ name: 'cntt-{tag}-gate'
+ project-type: multijob
+ disabled: true
+ triggers:
+ - cntt-patchset-created:
+ branch: '{branch}'
+ parameters:
+ - cntt-slave:
+ slave: '{slave}'
+ - cntt-build_tag:
+ build_tag: ''
+ - cntt-DEBUG:
+ DEBUG: 'true'
+ - cntt-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ properties:
+ - build-blocker:
+ use-build-blocker: true
+ blocking-level: 'NODE'
+ blocking-jobs:
+ - '^cntt-{tag}-(daily|gate)$'
+ builders:
+ - multijob:
+ name: deploy
+ projects:
+ - name: 'cntt-deploy-gate-{tag}'
+ <<: *cntt-jobs
+ - multijob:
+ name: remove former images
+ projects:
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-rmi'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-rmi'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rmi'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-rmi'
+ <<: *cntt-jobs
+ - multijob:
+ name: pull containers
+ projects:
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-pull'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-pull'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-pull'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-pull'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-pull'
+ <<: *cntt-jobs
+ - multijob:
+ name: opnfv/functest-healthcheck:{functest_tag}
+ projects:
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-connection_check-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-vmready1-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-vmready2-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-singlevm1-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-singlevm2-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-vping_ssh-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-vping_userdata-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-cinder_test-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-healthcheck-{tag}-odl-run'
+ <<: *cntt-jobs
+ - multijob:
+ name: opnfv/functest-smoke:{functest_tag}
+ projects:
+ - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-neutron_trunk-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-networking-sfc-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-smoke-{tag}-barbican-run'
+ <<: *cntt-jobs
+ - multijob:
+ name: opnfv/functest-benchmarking:{functest_tag}
+ projects:
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-vmtp-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-{tag}-shaker-run'
+ <<: *cntt-jobs
+ - multijob:
+ name: opnfv/functest-vnf:{functest_tag}
+ condition: ALWAYS
+ execution-type: SEQUENTIALLY
+ projects:
+ - name: 'cntt-opnfv-functest-vnf-{tag}-cloudify-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-cloudify_ims-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-heat_ims-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-vnf-{tag}-juju_epc-run'
+ <<: *cntt-jobs
+
+- project:
+ name: 'cntt'
+ <<: *cntt-params
+ jobs:
+ - 'cntt-{tag}-daily'
+ - 'cntt-{tag}-gate'
+
+- view:
+ name: cntt
+ view-type: list
+ columns:
+ - status
+ - weather
+ - job
+ - last-success
+ - last-failure
+ - last-duration
+ regex: ^cntt-[a-z]+-(daily|check|gate)$
diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
index 45e6db5..649538e 100644
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
@@ -48,7 +48,6 @@
- ovsnfv
- parser
- pharos
- - pharos-tools
- promise
- qtip
- releng
diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index c66624c..79d5262 100644
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -17,8 +17,6 @@
disabled: false
installer:
- - 'apex':
- scenario: 'os-nosdn-nofeature-noha'
- 'fuel':
scenario: 'os-nosdn-nofeature-noha'
@@ -30,10 +28,6 @@
- 'sample'
- 'congress'
- exclude:
- - installer: 'apex'
- arch: 'aarch64'
-
jobs:
- 'doctor-verify-{stream}'
- 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
@@ -64,18 +58,9 @@
# in phase jobs
echo "Triggering phase jobs!"
- multijob:
- name: 'doctor-verify-sample'
+ name: 'doctor-verify-fuel'
execution-type: PARALLEL
projects:
- - name: 'doctor-verify-all-apex-sample-x86_64-{stream}'
- predefined-parameters: |
- PROJECT=$PROJECT
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- kill-phase-on: FAILURE
- git-revision: true
- name: 'doctor-verify-fault_management-fuel-sample-x86_64-{stream}'
predefined-parameters: |
PROJECT=$PROJECT
@@ -85,24 +70,7 @@
GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
kill-phase-on: FAILURE
git-revision: true
- - multijob:
- name: 'doctor-verify-fenix'
- execution-type: PARALLEL
- projects:
- - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}'
- predefined-parameters: |
- PROJECT=$PROJECT
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- kill-phase-on: FAILURE
- git-revision: true
- - multijob:
- name: 'doctor-verify-congress'
- execution-type: PARALLEL
- projects:
- - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}'
+ - name: 'doctor-verify-maintenance-fuel-sample-x86_64-{stream}'
predefined-parameters: |
PROJECT=$PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
@@ -115,7 +83,7 @@
- job-template:
name: 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
disabled: '{obj:disabled}'
- node: 'doctor-{installer}-{arch}'
+ node: 'zte-virtual4'
wrappers:
- ssh-agent-wrapper
- build-timeout:
@@ -141,7 +109,7 @@
- job-template:
name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
disabled: '{obj:disabled}'
- node: 'doctor-{installer}-{arch}'
+ node: 'nokia-pod1'
wrappers:
- ssh-agent-wrapper
- build-timeout:
@@ -238,7 +206,7 @@
# run tox to trigger the test
# As Jenkins user, it has no permission to send ICMP package
- sudo -E tox -e py34
+ sudo -E tox -e py36
# -------------------------------
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index e914ae1..a52019e 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -133,8 +133,8 @@ get_cred_file() {
cat $OPENRC
echo "INFO: change cacert file path in credentials file"
change_cred_file_cacert_path
- echo "INFO: set external network in credentials file"
- change_cred_file_ext_net
+ #echo "INFO: set external network in credentials file"
+ #change_cred_file_ext_net
echo "INFO: final openstack credentials file is:"
cat $OPENRC
else
@@ -396,6 +396,7 @@ cat << EOF >$tempest_conf_file
compute:
min_compute_nodes: 2
volume_device_name: ${volume_device}
+ max_microversion: 2.65
EOF
diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index 686c009..a0741f1 100644
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -36,6 +36,8 @@
- 'smoke'
- 'benchmarking'
- 'vnf'
+ - 'smoke-cntt'
+ - 'benchmarking-cntt'
exclude:
- stream: 'master'
@@ -165,6 +167,28 @@
<<: *manifest-job-settings
- name: 'functest-vnf-docker-manifest-{stream}'
<<: *manifest-job-settings
+ - multijob:
+ name: 'build all functest cntt images'
+ condition: SUCCESSFUL
+ execution-type: PARALLEL
+ projects:
+ - name: 'functest-smoke-cntt-docker-build-amd64-{stream}'
+ <<: *build-job-settings
+ - name: 'functest-smoke-cntt-docker-build-arm64-{stream}'
+ <<: *build-job-settings
+ - name: 'functest-benchmarking-cntt-docker-build-amd64-{stream}'
+ <<: *build-job-settings
+ - name: 'functest-benchmarking-cntt-docker-build-arm64-{stream}'
+ <<: *build-job-settings
+ - multijob:
+ name: 'publish all cntt manifests'
+ condition: SUCCESSFUL
+ execution-type: PARALLEL
+ projects:
+ - name: 'functest-smoke-cntt-docker-manifest-{stream}'
+ <<: *manifest-job-settings
+ - name: 'functest-benchmarking-cntt-docker-manifest-{stream}'
+ <<: *manifest-job-settings
publishers:
- 'functest-amd64-recipients'
diff --git a/jjb/functest/functest-kubernetes-project-jobs.yaml b/jjb/functest/functest-kubernetes-project-jobs.yaml
index 82998f0..2e1a410 100644
--- a/jjb/functest/functest-kubernetes-project-jobs.yaml
+++ b/jjb/functest/functest-kubernetes-project-jobs.yaml
@@ -1,167 +1,80 @@
---
-###################################################
-# All the jobs except verify have been removed!
-# They will only be enabled on request by projects!
-###################################################
-- project:
- name: functest-kubernetes-project-jobs
-
- project: 'functest-kubernetes'
-
- jobs:
- - 'functest-kubernetes-verify-{stream}'
- - 'functest-kubernetes-verify-{phase}-{stream}'
-
- stream:
- - master:
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
- - jerma: &jerma
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
- - iruya: &iruya
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- - hunter: &hunter
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
-
- phase:
- - 'unit-tests-and-docs':
- slave-label: 'lf-virtual1'
-
-- job-template:
- name: 'functest-kubernetes-verify-{stream}'
-
- disabled: '{obj:disabled}'
-
- project-type: 'multijob'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - 'opnfv-build-ubuntu-defaults'
-
- scm:
- - git-scm-gerrit
-
- triggers:
- - 'functest-kubernetes-verify-triggers-macro':
- project: '{project}'
- branch: '{branch}'
-
- builders:
- - shell: |
- #!/bin/bash
- # we do nothing here as the main stuff will be done
- # in phase jobs
- echo "Triggering phase jobs!"
- - multijob:
- name: 'functest-kubernetes-build-and-unittest'
- execution-type: PARALLEL
- projects:
- - name: 'functest-kubernetes-verify-unit-tests-and-docs-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
-
-- job-template:
- name: 'functest-kubernetes-verify-{phase}-{stream}'
-
- disabled: '{obj:disabled}'
-
- wrappers:
- - ssh-agent-wrapper
- - build-timeout:
- timeout: 30
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - '{slave-label}-defaults'
-
- scm:
- - git-scm-gerrit
+- functest-kubernetes-project-params: &functest-kubernetes-project-params
+ name: 'functest-kubernetes-project-params'
+ tag:
+ - latest:
+ branch: master
+ slave: lf-virtual1
+ - jerma:
+ branch: stable/jerma
+ slave: lf-virtual1
+ - iruya:
+ branch: stable/iruya
+ slave: lf-virtual1
+ - hunter:
+ branch: stable/hunter
+ slave: lf-virtual1
+- builder:
+ name: functest-kubernetes-run-tox
builders:
- - 'functest-kubernetes-verify-{phase}-builders-macro'
-
- publishers:
- - 'functest-kubernetes-verify-{phase}-publishers-macro'
+ - shell: tox
-################################
-# job triggers
-################################
- trigger:
- name: 'functest-kubernetes-verify-triggers-macro'
+ name: functest-kubernetes-project-patchset-created
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
+ - patchset-created-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}'
+ project-pattern: 'functest-kubernetes'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
- disable-strict-forbidden-file-verification: 'true'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**|.gitignore'
+ skip-vote:
+ successful: false
+ failed: false
+ unstable: false
+ notbuilt: false
+
+- parameter:
+ name: functest-kubernetes-project-slave
+ parameters:
+ - label:
+ name: slave
+ default: '{slave}'
-################################
-# job builders
-################################
+- scm:
+ name: functest-kubernetes-project-scm
+ scm:
+ - git:
+ url: https://gerrit.opnfv.org/gerrit/functest-kubernetes
+ refspec: '+refs/changes/*:refs/changes/*'
+ branches:
+ - '{ref}'
-- builder:
- name: 'functest-kubernetes-verify-unit-tests-and-docs-builders-macro'
+- job-template:
+ name: 'functest-kubernetes-run-tox-{tag}'
+ triggers:
+ - functest-kubernetes-project-patchset-created:
+ branch: '{branch}'
+ scm:
+ - functest-kubernetes-project-scm:
+ ref: $GERRIT_REFSPEC
+ parameters:
+ - functest-kubernetes-project-slave:
+ slave: '{slave}'
builders:
- - shell: |
- cd $WORKSPACE && tox
+ - functest-kubernetes-run-tox
-################################
-# job publishers
-################################
-- publisher:
- name: 'functest-kubernetes-verify-unit-tests-and-docs-publishers-macro'
- publishers:
- - junit:
- results: nosetests.xml
- - cobertura:
- report-file: "coverage.xml"
- only-stable: "true"
- health-auto-update: "true"
- stability-auto-update: "true"
- zoom-coverage-chart: "true"
- targets:
- - files:
- healthy: 10
- unhealthy: 20
- failing: 30
- - method:
- healthy: 50
- unhealthy: 40
- failing: 30
- - email-jenkins-admins-on-failure
+- project:
+ name: 'functest-kubernetes-run-tox'
+ <<: *functest-kubernetes-project-params
+ jobs:
+ - 'functest-kubernetes-run-tox-{tag}'
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 484d5f9..12c9c26 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -13,7 +13,7 @@
slave: lf-virtual8
- jerma:
branch: stable/jerma
- slave: lf-virtual7
+ slave: lf-virtual8
- iruya:
branch: stable/iruya
slave: lf-virtual7
@@ -103,17 +103,14 @@
image={repo}:{port}/{container}:{tag}
fi
docker run --rm \
+ -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+ -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \
+ -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \
-v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
- $image run_tests -t {test}
- res=$?
- gsutil -m cp -r $WORKSPACE/ \
- gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
- find $WORKSPACE -type f \
- -printf \
- "http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n"
- exit $res
+ -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+ $image run_tests -t {test} -p
- builder:
name: functest-kubernetes-remove-images
diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml
index d50b1a5..0a83644 100644
--- a/jjb/functest/functest-project-jobs.yaml
+++ b/jjb/functest/functest-project-jobs.yaml
@@ -1,167 +1,80 @@
---
-###################################################
-# All the jobs except verify have been removed!
-# They will only be enabled on request by projects!
-###################################################
-- project:
- name: functest-project-jobs
-
- project: 'functest'
-
- jobs:
- - 'functest-verify-{stream}'
- - 'functest-verify-{phase}-{stream}'
-
- stream:
- - master:
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
+- functest-project-params: &functest-project-params
+ name: 'functest-project-params'
+ tag:
+ - latest:
+ branch: master
+ slave: lf-virtual9
- jerma:
- branch: 'stable/{stream}'
- gs-pathname: ''
- disabled: false
+ branch: stable/jerma
+ slave: lf-virtual4
- iruya:
- branch: 'stable/{stream}'
- gs-pathname: ''
- disabled: false
+ branch: stable/iruya
+ slave: lf-virtual4
- hunter:
- branch: 'stable/{stream}'
- gs-pathname: ''
- disabled: false
-
- phase:
- - 'unit-tests-and-docs':
- slave-label: 'lf-virtual1'
-
-- job-template:
- name: 'functest-verify-{stream}'
-
- disabled: '{obj:disabled}'
-
- project-type: 'multijob'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - 'opnfv-build-ubuntu-defaults'
-
- scm:
- - git-scm-gerrit
-
- triggers:
- - 'functest-verify-triggers-macro':
- project: '{project}'
- branch: '{branch}'
-
- builders:
- - shell: |
- #!/bin/bash
- # we do nothing here as the main stuff will be done
- # in phase jobs
- echo "Triggering phase jobs!"
- - multijob:
- name: 'functest-build-and-unittest'
- execution-type: PARALLEL
- projects:
- - name: 'functest-verify-unit-tests-and-docs-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
-
-- job-template:
- name: 'functest-verify-{phase}-{stream}'
-
- disabled: '{obj:disabled}'
-
- wrappers:
- - ssh-agent-wrapper
- - build-timeout:
- timeout: 60
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - '{slave-label}-defaults'
-
- scm:
- - git-scm-gerrit
+ branch: stable/hunter
+ slave: lf-virtual6
+- builder:
+ name: functest-run-tox
builders:
- - 'functest-verify-{phase}-builders-macro'
-
- publishers:
- - 'functest-verify-{phase}-publishers-macro'
+ - shell: tox
-################################
-# job triggers
-################################
- trigger:
- name: 'functest-verify-triggers-macro'
+ name: functest-project-patchset-created
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
+ - patchset-created-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}'
+ project-pattern: 'functest'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
- disable-strict-forbidden-file-verification: 'true'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**|.gitignore'
+ skip-vote:
+ successful: false
+ failed: false
+ unstable: false
+ notbuilt: false
+
+- parameter:
+ name: functest-project-slave
+ parameters:
+ - label:
+ name: slave
+ default: '{slave}'
-################################
-# job builders
-################################
+- scm:
+ name: functest-project-scm
+ scm:
+ - git:
+ url: https://gerrit.opnfv.org/gerrit/functest
+ refspec: '+refs/changes/*:refs/changes/*'
+ branches:
+ - '{ref}'
-- builder:
- name: 'functest-verify-unit-tests-and-docs-builders-macro'
+- job-template:
+ name: 'functest-run-tox-{tag}'
+ triggers:
+ - functest-project-patchset-created:
+ branch: '{branch}'
+ scm:
+ - functest-project-scm:
+ ref: $GERRIT_REFSPEC
+ parameters:
+ - functest-project-slave:
+ slave: '{slave}'
builders:
- - shell: |
- cd $WORKSPACE && tox
+ - functest-run-tox
-################################
-# job publishers
-################################
-- publisher:
- name: 'functest-verify-unit-tests-and-docs-publishers-macro'
- publishers:
- - junit:
- results: nosetests.xml
- - cobertura:
- report-file: "coverage.xml"
- only-stable: "true"
- health-auto-update: "true"
- stability-auto-update: "true"
- zoom-coverage-chart: "true"
- targets:
- - files:
- healthy: 10
- unhealthy: 20
- failing: 30
- - method:
- healthy: 50
- unhealthy: 40
- failing: 30
- - email-jenkins-admins-on-failure
+- project:
+ name: 'functest-run-tox'
+ <<: *functest-project-params
+ jobs:
+ - 'functest-run-tox-{tag}'
diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml
deleted file mode 100644
index 8d20dd2..0000000
--- a/jjb/functest/functest-rtd-jobs.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-- project:
- name: functest-rtd
- project: functest
- project-name: functest
-
- gerrit-skip-vote: true
- project-pattern: 'functest'
- rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-functest/47369/'
- rtd-token: '26f9131bd5c337928ba8b431a289f6850b330504'
-
- stream:
- - master:
- branch: '{stream}'
- disabled: false
- - iruya:
- branch: 'stable/{stream}'
- disabled: false
- - hunter:
- branch: 'stable/{stream}'
- disabled: false
-
- jobs:
- - '{project-name}-rtd-jobs'
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index fc0718a..feb672c 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -11,15 +11,19 @@
- latest:
branch: master
slave: lf-virtual9
+ dashboard_url: http://172.30.13.94
- jerma:
branch: stable/jerma
slave: lf-virtual4
+ dashboard_url: http://172.30.13.89
- iruya:
branch: stable/iruya
slave: lf-virtual4
+ dashboard_url: http://172.30.13.89
- hunter:
branch: stable/hunter
slave: lf-virtual6
+ dashboard_url: http://172.30.13.91
- parameter:
name: functest-slave
@@ -35,6 +39,20 @@
name: branch
default: '{branch}'
+- parameter:
+ name: functest-DEBUG
+ parameters:
+ - string:
+ name: DEBUG
+ default: 'true'
+
+- parameter:
+ name: functest-EXTERNAL_NETWORK
+ parameters:
+ - string:
+ name: EXTERNAL_NETWORK
+ default: public
+
- functest-containers: &functest-containers
name: 'functest-containers'
repo: '{repo}'
@@ -43,9 +61,10 @@
tag: '{tag}'
- functest-run-containers: &functest-run-containers
- name: 'functest-build-containers'
+ name: 'functest-run-containers'
<<: *functest-containers
test: '{test}'
+ dashboard_url: '{dashboard_url}'
- functest-build-containers: &functest-build-containers
name: 'functest-build-containers'
@@ -93,7 +112,7 @@
name: functest-run-containers
builders:
- shell: |
- set +ex
+ set +x
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -112,9 +131,13 @@
py=2.7
fi
sudo docker run --rm \
+ -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+ -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \
+ -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
- -e DEBUG=True \
- -e EXTERNAL_NETWORK=public \
+ -e DEBUG=$DEBUG \
+ -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
+ -e DASHBOARD_URL={dashboard_url} \
-v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
-v /home/opnfv/functest/images:/home/opnfv/functest/images \
-v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\
@@ -122,14 +145,8 @@
blacklist.yaml \
-v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\
site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
- $image run_tests -t {test}
- res=$?
- gsutil -m cp -r $WORKSPACE/ \
- gs://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
- find $WORKSPACE -type f \
- -printf \
- "http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID/%P\n"
- exit $res
+ -v /home/opnfv/functest/.boto:/root/.boto \
+ $image run_tests -t {test} -p
- builder:
name: functest-remove-images
@@ -178,6 +195,13 @@
- 'functest-{repo}-{container}-{tag}-pull'
- project:
+ name: 'functest-opnfv-functest-smoke-cntt-pull'
+ <<: *functest-params
+ container: 'functest-smoke-cntt'
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-pull'
+
+- project:
name: 'functest-opnfv-functest-benchmarking-pull'
<<: *functest-params
container: 'functest-benchmarking'
@@ -215,6 +239,13 @@
- 'functest-{repo}-{container}-{tag}-rmi'
- project:
+ name: 'functest-opnfv-functest-smoke-cntt-rmi'
+ <<: *functest-params
+ container: 'functest-smoke-cntt'
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-rmi'
+
+- project:
name: 'functest-opnfv-functest-benchmarking-rmi'
<<: *functest-params
container: 'functest-benchmarking'
@@ -233,6 +264,10 @@
parameters:
- functest-slave:
slave: '{slave}'
+ - functest-DEBUG:
+ DEBUG: 'true'
+ - functest-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
builders:
- functest-run-containers:
<<: *functest-run-containers
@@ -254,6 +289,10 @@
- cinder_test
- odl
- tempest_smoke
+ - tempest_horizon
+ exclude:
+ - tag: hunter
+ test: tempest_horizon
jobs:
- 'functest-{repo}-{container}-{tag}-{test}-run'
@@ -263,6 +302,8 @@
container: 'functest-smoke'
test:
- neutron-tempest-plugin-api
+ - tempest_cinder
+ - tempest_keystone
- rally_sanity
- refstack_defcore
- refstack_compute
@@ -293,13 +334,26 @@
- tag: hunter
test: refstack_platform
- tag: hunter
- test: tempest_slow
- - tag: hunter
test: octavia
jobs:
- 'functest-{repo}-{container}-{tag}-{test}-run'
- project:
+ name: 'functest-opnfv-functest-smoke-cntt'
+ <<: *functest-params
+ container: 'functest-smoke-cntt'
+ test:
+ - neutron-tempest-plugin-api
+ - tempest_cinder
+ - tempest_keystone
+ - rally_sanity
+ - tempest_full
+ - tempest_scenario
+ - tempest_slow
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-{test}-run'
+
+- project:
name: 'functest-opnfv-functest-benchmarking'
<<: *functest-params
container: 'functest-benchmarking'
@@ -332,6 +386,10 @@
parameters:
- functest-slave:
slave: '{slave}'
+ - functest-DEBUG:
+ DEBUG: 'true'
+ - functest-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
properties:
- build-blocker:
use-build-blocker: true
@@ -346,6 +404,8 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-rmi'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
<<: *functest-jobs
- name: 'functest-opnfv-functest-vnf-{tag}-rmi'
@@ -357,6 +417,8 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-pull'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-pull'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-benchmarking-{tag}-pull'
<<: *functest-jobs
- name: 'functest-opnfv-functest-vnf-{tag}-pull'
@@ -388,11 +450,17 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-smoke:{tag}
projects:
- name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -422,6 +490,23 @@
- name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
<<: *functest-jobs
- multijob:
+ name: opnfv/functest-smoke-cntt:{tag}
+ projects:
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-benchmarking:{tag}
projects:
- name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
@@ -558,6 +643,16 @@
- 'functest-{repo}-{container}-{tag}-gate'
- 'functest-{repo}-{container}-{tag}-check'
+- project:
+ name: functest-opnfv-functest-smoke-cntt-{tag}-build
+ <<: *functest-params
+ container: functest-smoke-cntt
+ ref_arg: BRANCH
+ path: docker/smoke-cntt
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-gate'
+ - 'functest-{repo}-{container}-{tag}-check'
+
- job-template:
name: 'functest-{tag}-check'
project-type: multijob
@@ -566,6 +661,10 @@
slave: '{slave}'
- functest-branch:
branch: '{branch}'
+ - functest-DEBUG:
+ DEBUG: 'true'
+ - functest-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
properties:
- build-blocker:
use-build-blocker: true
@@ -580,6 +679,8 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-rmi'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
<<: *functest-jobs
- name: 'functest-opnfv-functest-vnf-{tag}-rmi'
@@ -616,6 +717,11 @@
- name: 'functest-opnfv-functest-vnf-{tag}-check'
<<: *functest-jobs
- multijob:
+ name: build opnfv/functest-smoke-cntt
+ projects:
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-check'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-healthcheck:{tag}
projects:
- name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run'
@@ -642,11 +748,17 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-smoke:{tag}
projects:
- name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -676,6 +788,23 @@
- name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
<<: *functest-jobs
- multijob:
+ name: opnfv/functest-smoke-cntt:{tag}
+ projects:
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-benchmarking:{tag}
projects:
- name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
@@ -733,6 +862,10 @@
parameters:
- functest-slave:
slave: '{slave}'
+ - functest-DEBUG:
+ DEBUG: 'true'
+ - functest-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
properties:
- build-blocker:
use-build-blocker: true
@@ -747,6 +880,8 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-rmi'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
<<: *functest-jobs
- name: 'functest-opnfv-functest-vnf-{tag}-rmi'
@@ -783,6 +918,11 @@
- name: 'functest-opnfv-functest-vnf-{tag}-gate'
<<: *functest-jobs
- multijob:
+ name: build opnfv/functest-smoke-cntt
+ projects:
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-healthcheck:{tag}
projects:
- name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run'
@@ -809,11 +949,17 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-smoke:{tag}
projects:
- name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
<<: *functest-jobs
- name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -843,6 +989,23 @@
- name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
<<: *functest-jobs
- multijob:
+ name: opnfv/functest-smoke-cntt:{tag}
+ projects:
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-benchmarking:{tag}
projects:
- name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
diff --git a/jjb/functest/xtesting-project-jobs.yaml b/jjb/functest/xtesting-project-jobs.yaml
index b030fce..a1013fe 100644
--- a/jjb/functest/xtesting-project-jobs.yaml
+++ b/jjb/functest/xtesting-project-jobs.yaml
@@ -1,167 +1,80 @@
---
-###################################################
-# All the jobs except verify have been removed!
-# They will only be enabled on request by projects!
-###################################################
-- project:
- name: xtesting-project-jobs
-
- project: 'functest-xtesting'
-
- jobs:
- - 'xtesting-verify-{stream}'
- - 'xtesting-verify-{phase}-{stream}'
-
- stream:
- - master:
- branch: '{stream}'
- gs-pathname: ''
- disabled: false
- - jerma: &jerma
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- - iruya: &iruya
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
- - hunter: &hunter
- branch: 'stable/{stream}'
- gs-pathname: '/{stream}'
- disabled: false
-
- phase:
- - 'unit-tests-and-docs':
- slave-label: 'lf-virtual1'
-
-- job-template:
- name: 'xtesting-verify-{stream}'
-
- disabled: '{obj:disabled}'
-
- project-type: 'multijob'
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - 'opnfv-build-ubuntu-defaults'
-
- scm:
- - git-scm-gerrit
-
- triggers:
- - 'xtesting-verify-triggers-macro':
- project: '{project}'
- branch: '{branch}'
-
- builders:
- - shell: |
- #!/bin/bash
- # we do nothing here as the main stuff will be done
- # in phase jobs
- echo "Triggering phase jobs!"
- - multijob:
- name: 'xtesting-build-and-unittest'
- execution-type: PARALLEL
- projects:
- - name: 'xtesting-verify-unit-tests-and-docs-{stream}'
- current-parameters: false
- predefined-parameters: |
- GERRIT_BRANCH=$GERRIT_BRANCH
- GERRIT_REFSPEC=$GERRIT_REFSPEC
- GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
- GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
- git-revision: true
- node-parameters: false
- kill-phase-on: FAILURE
- abort-all-job: false
-
-- job-template:
- name: 'xtesting-verify-{phase}-{stream}'
-
- disabled: '{obj:disabled}'
-
- wrappers:
- - ssh-agent-wrapper
- - build-timeout:
- timeout: 30
-
- parameters:
- - project-parameter:
- project: '{project}'
- branch: '{branch}'
- - '{slave-label}-defaults'
-
- scm:
- - git-scm-gerrit
+- xtesting-project-params: &xtesting-project-params
+ name: 'xtesting-project-params'
+ tag:
+ - latest:
+ branch: master
+ slave: lf-virtual1
+ - jerma:
+ branch: stable/jerma
+ slave: lf-virtual1
+ - iruya:
+ branch: stable/iruya
+ slave: lf-virtual1
+ - hunter:
+ branch: stable/hunter
+ slave: lf-virtual1
+- builder:
+ name: xtesting-run-tox
builders:
- - 'xtesting-verify-{phase}-builders-macro'
-
- publishers:
- - 'xtesting-verify-{phase}-publishers-macro'
+ - shell: tox
-################################
-# job triggers
-################################
- trigger:
- name: 'xtesting-verify-triggers-macro'
+ name: xtesting-project-patchset-created
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
+ - patchset-created-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}'
+ project-pattern: 'functest-xtesting'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
- disable-strict-forbidden-file-verification: 'true'
- forbidden-file-paths:
- - compare-type: ANT
- pattern: 'docs/**|.gitignore'
+ skip-vote:
+ successful: false
+ failed: false
+ unstable: false
+ notbuilt: false
+
+- parameter:
+ name: xtesting-project-slave
+ parameters:
+ - label:
+ name: slave
+ default: '{slave}'
-################################
-# job builders
-################################
+- scm:
+ name: xtesting-project-scm
+ scm:
+ - git:
+ url: https://gerrit.opnfv.org/gerrit/functest-xtesting
+ refspec: '+refs/changes/*:refs/changes/*'
+ branches:
+ - '{ref}'
-- builder:
- name: 'xtesting-verify-unit-tests-and-docs-builders-macro'
+- job-template:
+ name: 'xtesting-run-tox-{tag}'
+ triggers:
+ - xtesting-project-patchset-created:
+ branch: '{branch}'
+ scm:
+ - xtesting-project-scm:
+ ref: $GERRIT_REFSPEC
+ parameters:
+ - xtesting-project-slave:
+ slave: '{slave}'
builders:
- - shell: |
- cd $WORKSPACE && tox
+ - xtesting-run-tox
-################################
-# job publishers
-################################
-- publisher:
- name: 'xtesting-verify-unit-tests-and-docs-publishers-macro'
- publishers:
- - junit:
- results: nosetests.xml
- - cobertura:
- report-file: "coverage.xml"
- only-stable: "true"
- health-auto-update: "true"
- stability-auto-update: "true"
- zoom-coverage-chart: "true"
- targets:
- - files:
- healthy: 10
- unhealthy: 20
- failing: 30
- - method:
- healthy: 50
- unhealthy: 40
- failing: 30
- - email-jenkins-admins-on-failure
+- project:
+ name: 'xtesting-run-tox'
+ <<: *xtesting-project-params
+ jobs:
+ - 'xtesting-run-tox-{tag}'
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index cc9ec07..b34fc10 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -93,7 +93,7 @@
name: xtesting-run-containers
builders:
- shell: |
- set +ex
+ set +x
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -103,16 +103,13 @@
image={repo}:{port}/{container}:{tag}
fi
sudo docker run --rm \
+ -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+ -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \
+ -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+ -v /home/opnfv/xtesting/.boto:/root/.boto \
-e DEBUG=true \
- $image run_tests -t {test}
- res=$?
- gsutil -m cp -r $WORKSPACE/ \
- gs://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
- find $WORKSPACE -type f \
- -printf \
- "http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID/%P\n"
- exit $res
+ $image run_tests -t {test} -p
- builder:
name: xtesting-remove-images
diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index cb6f0f2..5b1bdee 100644
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -856,9 +856,14 @@
<<: *email_ptl_defaults
recipients: >
jack@jento.io
-- publisher:
- name: 'email-pharos-tools-ptl'
- <<: *email_pharos_ptl_defaults
+
+- publisher: &email_laas_ptl_defaults
+ name: 'email-laas-ptl'
+ publishers:
+ - email-ext:
+ <<: *email_laas_ptl_defaults
+ recipients: >
+ pberberian@iol.unh.edu
- publisher:
name: 'email-promise-ptl'
diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index d721ff2..b597b30 100644
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -539,11 +539,11 @@
description: "Directory where the build artifact will be located upon the completion of the build."
- parameter:
- name: 'pharos-dashboard-defaults'
+ name: 'laas-dashboard-defaults'
parameters:
- label:
name: SLAVE_LABEL
- default: 'pharos-dashboard2'
+ default: 'laas-dashboard'
description: 'Slave label on Jenkins'
all-nodes: false
node-eligibility: 'ignore-offline'
diff --git a/jjb/pharos/pharos-tools.yml b/jjb/laas/laas.yml
index e28d0be..76c475e 100644
--- a/jjb/pharos/pharos-tools.yml
+++ b/jjb/laas/laas.yml
@@ -1,9 +1,9 @@
---
- project:
- name: pharos-dashboard-jobs
+ name: laas-dashboard-jobs
- project: 'pharos-tools'
- project-name: 'pharos-tools'
+ project: 'laas'
+ project-name: 'laas'
stream:
- master
@@ -11,14 +11,14 @@
disabled: false
jobs:
- - 'pharos-dashboard-backup'
- - 'pharos-dashboard-deploy'
+ - 'laas-dashboard-backup'
+ - 'laas-dashboard-deploy'
- project:
- name: pharos-dashboard-verify
+ name: laas-dashboard-verify
- project: 'pharos-tools'
- project-name: 'pharos-tools'
+ project: 'laas'
+ project-name: 'laas'
build-days-to-keep: 7
tox-dir: 'dashboard'
@@ -31,12 +31,12 @@
- 'gerrit-tox-verify'
- job-template:
- name: 'pharos-dashboard-backup'
+ name: 'laas-dashboard-backup'
disabled: '{obj:disabled}'
parameters:
- - 'pharos-dashboard-defaults'
+ - 'laas-dashboard-defaults'
triggers:
- timed: '@daily'
@@ -46,7 +46,7 @@
!include-raw: shell/backup-dashboard.sh
- job-template:
- name: 'pharos-dashboard-deploy'
+ name: 'laas-dashboard-deploy'
disabled: '{obj:disabled}'
@@ -54,7 +54,7 @@
- project-parameter:
project: '{project}'
branch: 'master'
- - 'pharos-dashboard-defaults'
+ - 'laas-dashboard-defaults'
scm:
- git-scm-gerrit
diff --git a/jjb/pharos/shell/backup-dashboard.sh b/jjb/laas/shell/backup-dashboard.sh
index 4c1c015..39f5be4 100644
--- a/jjb/pharos/shell/backup-dashboard.sh
+++ b/jjb/laas/shell/backup-dashboard.sh
@@ -10,19 +10,19 @@
BACKUP_DIR=$HOME/backups
DATE=$(date +%Y%m%d)
-TAR_FILE=pharos-dashboard-db-$DATE.tar.tz
+TAR_FILE=laas-dashboard-db-$DATE.tar.tz
mkdir -p $BACKUP_DIR
echo "-- $DATE --"
-echo "--> Backing up Pharos Dashboard"
+echo "--> Backing up Lab as a Service Dashboard"
docker run --rm \
- -v pharos-data:/pharos-data:ro \
+ -v laas-data:/laas-data:ro \
-v $BACKUP_DIR:/backup \
alpine \
- tar -czf /backup/$TAR_FILE -C /pharos-data ./
+ tar -czf /backup/$TAR_FILE -C /laas-data ./
/usr/local/bin/gsutil cp $BACKUP_DIR/$TAR_FILE \
- gs://opnfv-backups/pharos-dashboard/ && rm $BACKUP_DIR/$TAR_FILE
+ gs://opnfv-backups/laas-dashboard/ && rm $BACKUP_DIR/$TAR_FILE
-echo "--> Pharos dashboard backup complete"
+echo "--> LAAS dashboard backup complete"
diff --git a/jjb/pharos/shell/deploy-dashboard.sh b/jjb/laas/shell/deploy-dashboard.sh
index 46a79c3..d3ad29b 100644
--- a/jjb/pharos/shell/deploy-dashboard.sh
+++ b/jjb/laas/shell/deploy-dashboard.sh
@@ -15,5 +15,5 @@ docker-compose up -d
# Copy JIRA keys into web container
WEB_CONTAINER="$(docker ps --filter 'name=dg01' -q)"
-docker cp $HOME/rsa.pub $WEB_CONTAINER:/pharos_dashboard/account/
-docker cp $HOME/rsa.pem $WEB_CONTAINER:/pharos_dashboard/account/
+docker cp $HOME/rsa.pub $WEB_CONTAINER:/laas_dashboard/account/
+docker cp $HOME/rsa.pem $WEB_CONTAINER:/laas_dashboard/account/
diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index 85ddbf0..f334c67 100644
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -15,7 +15,7 @@
stream: hunter
branch: 'stable/{stream}'
disabled: false
- pharos-tools-receivers: &pharos_tools_receivers
+ laas-receivers: &laas_receivers
receivers: >
pberberian@iol.unh.edu
sbergeron@iol.unh.edu
@@ -200,18 +200,18 @@
project: 'nfvbench'
<<: *master
<<: *other-receivers
- - 'pharos-tools-laas-dashboard':
- project: 'pharos-tools'
- dockerdir: 'dashboard'
+ - 'laas-dashboard':
+ project: 'laas'
+ dockerdir: '.'
dockerfile: 'web/Dockerfile'
<<: *master
- <<: *pharos_tools_receivers
- - 'pharos-tools-laas-celery':
- project: 'pharos-tools'
- dockerdir: 'dashboard'
+ <<: *laas_receivers
+ - 'laas-celery':
+ project: 'laas'
+ dockerdir: '.'
dockerfile: 'worker/Dockerfile'
<<: *master
- <<: *pharos_tools_receivers
+ <<: *laas_receivers
- 'qtip':
project: 'qtip'
dockerdir: '.'
diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml
index 726760e..74734b8 100644
--- a/jjb/yardstick/yardstick-project-jobs.yaml
+++ b/jjb/yardstick/yardstick-project-jobs.yaml
@@ -67,9 +67,7 @@
fail: true
builders:
- - yardstick-unit-tests-python-27
- yardstick-unit-tests-python-3
- - yardstick-functional-tests-python-27
- yardstick-functional-tests-python-3
- yardstick-coverage-tests
- yardstick-pep8-tests
@@ -114,9 +112,7 @@
fail: true
builders:
- - yardstick-unit-tests-python-27
- yardstick-unit-tests-python-3
- - yardstick-functional-tests-python-27
- yardstick-functional-tests-python-3
- yardstick-coverage-tests
- yardstick-pep8-tests
@@ -126,22 +122,6 @@
################################
- builder:
- name: yardstick-unit-tests-python-27
- builders:
- - shell: |
- #!/bin/bash
- set -o errexit
- set -o pipefail
-
- sudo apt-get -y autoremove
- sudo apt-get install -y build-essential python-dev python3-dev
- sudo apt-get -y clean && sudo apt-get -y autoremove
-
- echo "Running unit tests in Python 2.7 ..."
- cd $WORKSPACE
- tox -epy27
-
-- builder:
name: yardstick-unit-tests-python-3
builders:
- shell: |
@@ -158,30 +138,6 @@
tox -epy3
- builder:
- name: yardstick-functional-tests-python-27
- builders:
- - shell: |
- #!/bin/bash
- set -o errexit
- set -o pipefail
-
- sudo apt-get -y autoremove
- sudo apt-get install -y build-essential python-dev python3-dev rabbitmq-server
- sudo apt-get -y clean && sudo apt-get -y autoremove
-
- echo "Configure RabbitMQ service"
- sudo service rabbitmq-server restart
- sudo rabbitmqctl start_app
- if [ -z "$(sudo rabbitmqctl list_users | grep yardstick)" ]; then
- sudo rabbitmqctl add_user yardstick yardstick
- sudo rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
- fi
-
- echo "Running functional tests in Python 2.7 ..."
- cd $WORKSPACE
- tox -efunctional
-
-- builder:
name: yardstick-functional-tests-python-3
builders:
- shell: |
diff --git a/tox.ini b/tox.ini
index 0cc9e23..cb6aa26 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,12 +14,14 @@ setenv=
PYTHONPATH = {toxinidir}
[testenv:jjb]
+basepython = python3
deps =
jenkins-job-builder==2.5.0
commands=
jenkins-jobs test -o job_output -r {posargs:"jjb/"}
[testenv:docs]
+basepython = python3
deps = -r{toxinidir}/docs/requirements.txt
commands =
sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs {toxinidir}/docs/_build/html
@@ -27,5 +29,6 @@ commands =
whitelist_externals = echo
[testenv:docs-linkcheck]
+basepython = python3
deps = -r{toxinidir}/docs/requirements.txt
commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs {toxinidir}/docs/_build/linkcheck