summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-daily-jobs.yml256
-rw-r--r--jjb/global/releng-macros.yml2
-rw-r--r--jjb/releng/opnfv-lint.yml2
-rw-r--r--jjb/releng/opnfv-utils.yml38
-rw-r--r--jjb/releng/releng-ci-jobs.yml2
-rw-r--r--jjb/xci/bifrost-periodic-jobs.yml2
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml11
-rwxr-xr-xjjb/xci/bifrost-verify.sh2
-rw-r--r--jjb/xci/xci-daily-jobs.yml8
-rwxr-xr-xjjb/xci/xci-deploy.sh6
-rw-r--r--jjb/xci/xci-merge-jobs.yml5
-rwxr-xr-xjjb/xci/xci-start-new-vm.sh2
-rw-r--r--jjb/xci/xci-verify-jobs.yml3
13 files changed, 278 insertions, 61 deletions
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 099d01a59..0f1ac351d 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -193,22 +193,107 @@
# <<: *master
# -------------------------------
- testsuite:
- - 'suite':
- job-timeout: 60
- - 'daily':
- job-timeout: 300
- - 'arm-daily':
- job-timeout: 300
+ functest-tier:
+ - 'healthcheck':
+ job-timeout: 20
+ - 'smoke':
+ job-timeout: 180
+ - 'components':
+ job-timeout: 240
+ - 'vnf':
+ job-timeout: 240
- jobs:
- - 'functest-{installer}-{pod}-{testsuite}-{stream}'
+ features-suite:
+ - 'doctor-notification'
+ - 'promise'
+ - 'bgpvpn'
+ - 'functest-odl-sfc'
+ - 'domino-multinode'
+ - 'fds'
+ - 'barometercollectd'
+
+ exclude:
+ - features-suite: 'promise'
+ stream: 'master'
+ - features-suite: 'domino-multinode'
+ stream: 'master'
+ - features-suite: 'fds'
+ stream: 'euphrates'
+
+ build-job-settings: &build-job-settings
+ current-parameter: false
+ git-revision: true
+ node-parameters: false
+ kill-phase-on: FAILURE
+ abort-all-jobs: false
+ predefined-parameters: |
+ FUNCTEST_MODE=$FUNCTEST_MODE
+ FUNCTEST_TIER=$FUNCTEST_TIER
+
+ features-job-settings: &features-job-settings
+ current-parameter: false
+ git-revision: true
+ node-parameters: false
+ kill-phase-on: FAILURE
+ abort-all-jobs: false
+ predefined-parameters: |
+ FUNCTEST_MODE=$FUNCTEST_MODE
+ FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+ jobs:
+ - 'functest-{installer}-{pod}-suite-{stream}'
+ - 'functest-{installer}-{pod}-daily-{stream}'
+ - 'functest-{installer}-{pod}-daily-{functest-tier}-{stream}'
+ - 'functest-{installer}-{pod}-daily-features-{features-suite}-{stream}'
################################
# job template
################################
- job-template:
- name: 'functest-{installer}-{pod}-{testsuite}-{stream}'
+
+ name: 'functest-{installer}-{pod}-daily-{stream}'
+
+ project-type: multijob
+
+ disabled: '{obj:disabled}'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - '{installer}-defaults'
+ - '{slave-label}-defaults'
+ - functest-parameter:
+ gs-pathname: '{gs-pathname}'
+
+ builders:
+ - multijob:
+ name: 'Run functest tests'
+ execution-type: SEQUENTIAL
+ projects:
+ - name: 'functest-{installer}-{pod}-daily-healthcheck-{stream}'
+ <<: *build-job-settings
+ - name: 'functest-{installer}-{pod}-daily-smoke-{stream}'
+ <<: *build-job-settings
+ - name: 'functest-{installer}-{pod}-daily-vnf-{stream}'
+ <<: *build-job-settings
+ - name: 'functest-{installer}-{pod}-daily-features-doctor-notification-{stream}'
+ <<: *features-job-settings
+ - name: 'functest-{installer}-{pod}-daily-features-bgpvpn-{stream}'
+ <<: *features-job-settings
+ - name: 'functest-{installer}-{pod}-daily-features-functest-odl-sfc-{stream}'
+ <<: *features-job-settings
+ - name: 'functest-{installer}-{pod}-daily-features-barometercollectd-{stream}'
+ <<: *features-job-settings
+ - name: 'functest-{installer}-{pod}-daily-features-fds-{stream}'
+ <<: *features-job-settings
+ - name: 'functest-{installer}-{pod}-daily-features-promise-{stream}'
+ <<: *features-job-settings
+ - name: 'functest-{installer}-{pod}-daily-features-domino-multinode-{stream}'
+ <<: *features-job-settings
+
+- job-template: &functest-installer-tier-job
+
+ name: 'functest-{installer}-{pod}-daily-{functest-tier}-{stream}'
concurrent: true
@@ -232,10 +317,15 @@
branch: '{branch}'
- '{installer}-defaults'
- '{slave-label}-defaults'
- - 'functest-{testsuite}-parameter'
+ - string:
+ name: FUNCTEST_MODE
+ default: 'tier'
+ - string:
+ name: FUNCTEST_TIER
+ default: '{functest-tier}'
- string:
name: DEPLOY_SCENARIO
- default: 'os-odl_l2-nofeature-ha'
+ default: 'os-nosdn-nofeature-noha'
- string:
name: CLEAN_DOCKER_IMAGES
default: 'false'
@@ -249,7 +339,93 @@
builders:
- description-setter:
description: "Built on $NODE_NAME"
- - 'functest-{testsuite}-builder'
+ - 'functest-daily-builder'
+
+ publishers:
+ - 'functest-recipients'
+ - 'fuel-recipients'
+
+- job-template:
+
+ name: 'functest-{installer}-{pod}-suite-{stream}'
+ <<: *functest-installer-tier-job
+
+ wrappers:
+ - build-name:
+ name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO'
+ - timeout:
+ timeout: '60'
+ abort: true
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - '{installer}-defaults'
+ - '{slave-label}-defaults'
+ - 'functest-suite-parameter'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-noha'
+ - string:
+ name: CLEAN_DOCKER_IMAGES
+ default: 'false'
+ description: 'Remove downloaded docker images (opnfv/functest*:*)'
+ - functest-parameter:
+ gs-pathname: '{gs-pathname}'
+
+ builders:
+ - description-setter:
+ description: "Built on $NODE_NAME"
+ - 'functest-suite-builder'
+
+- job-template:
+
+ name: 'functest-{installer}-{pod}-daily-features-{features-suite}-{stream}'
+ concurrent: true
+ properties:
+ - logrotate-default
+ - throttle:
+ enabled: true
+ max-per-node: 1
+ option: 'project'
+ wrappers:
+ - build-name:
+ name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO'
+
+ parameters:
+ - project-parameter:
+ project: '{project}'
+ branch: '{branch}'
+ - '{installer}-defaults'
+ - '{slave-label}-defaults'
+ - string:
+ name: FUNCTEST_MODE
+ default: 'testcase'
+ - string:
+ name: FUNCTEST_SUITE_NAME
+ default: '{features-suite}'
+ - string:
+ name: DEPLOY_SCENARIO
+ default: 'os-nosdn-nofeature-noha'
+ - string:
+ name: CLEAN_DOCKER_IMAGES
+ default: 'false'
+ description: 'Remove downloaded docker images (opnfv/functest*:*)'
+ - functest-parameter:
+ gs-pathname: '{gs-pathname}'
+
+ scm:
+ - git-scm
+
+ builders:
+ - description-setter:
+ description: "Built on $NODE_NAME"
+ - 'functest-daily-builder'
+
+ publishers:
+ - 'functest-features-recipients'
+ - 'functest-recipients'
+ - 'fuel-recipients'
########################
@@ -264,14 +440,6 @@
description: "Daily suite name to run"
- parameter:
- name: functest-arm-daily-parameter
- parameters:
- - string:
- name: FUNCTEST_MODE
- default: 'arm-daily'
- description: "Daily suite name (Aarch64) to run"
-
-- parameter:
name: functest-suite-parameter
parameters:
- choice:
@@ -364,14 +532,6 @@
- 'functest-exit'
- builder:
- name: functest-arm-daily-builder
- builders:
- - 'functest-cleanup'
- - 'functest-arm-daily'
- - 'functest-store-results'
- - 'functest-exit'
-
-- builder:
name: functest-suite-builder
builders:
- 'functest-cleanup'
@@ -405,17 +565,6 @@
# yamllint enable rule:indentation
- builder:
- name: functest-arm-daily
- builders:
- # yamllint disable rule:indentation
- - shell:
- !include-raw:
- - ./functest-env-presetup.sh
- - ../../utils/fetch_os_creds.sh
- - ./functest-alpine.sh
-
-# yamllint enable rule:indentation
-- builder:
name: functest-store-results
builders:
- shell:
@@ -432,3 +581,30 @@
builders:
- shell:
!include-raw: ./functest-exit.sh
+
+
+- publisher:
+ name: 'functest-features-recipients'
+ publishers:
+ - email:
+ recipients:
+
+- publisher:
+ name: 'functest-recipients'
+ publishers:
+ - email:
+ recipients: >
+ jalausuch@suse.com morgan.richomme@orange.com
+ cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
+ juha.kosonen@nokia.com wangwulin@huawei.com
+ delia.popescu@enea.com cristina.pauna@enea.com
+ valentin.boucher@kontron.com
+ - email-jenkins-admins-on-failure
+
+- publisher:
+ name: 'fuel-recipients'
+ publishers:
+ - email:
+ recipients: >
+ peter.barabas@ericsson.com mpolenchuck@mirantis.com
+ alexandru.avadanii@enea.com guillermo.herrero@enea.com
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index a12a3c8a5..0bf981661 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -901,7 +901,7 @@
- email-ext:
<<: *email_ptl_defaults
recipients: >
- ManuelBuilmbuil@suse.com
+ mbuil@suse.com
- publisher:
name: 'email-snaps-ptl'
diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index e9e929de6..0ac552082 100644
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -117,7 +117,7 @@
comment-contains-value: 'reverify'
projects:
- project-compare-type: 'REG_EXP'
- project-pattern: 'functest|sdnvpn|qtip|daisy|sfc|escalator'
+ project-pattern: 'functest|functest-kubernetes|sdnvpn|qtip|daisy|sfc|escalator'
branches:
- branch-compare-type: 'ANT'
branch-pattern: '**/{branch}'
diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml
index b12f663aa..93b3615ef 100644
--- a/jjb/releng/opnfv-utils.yml
+++ b/jjb/releng/opnfv-utils.yml
@@ -8,6 +8,7 @@
- 'archive-repositories'
- 'check-status-of-slaves'
- 'ansible-build-server'
+ - 'generate-artifacts-index-pages'
########################
# job templates
@@ -164,3 +165,40 @@
sudo ansible-playbook -C -D -i \
$WORKSPACE/utils/build-server-ansible/inventory.ini \
$WORKSPACE/utils/build-server-ansible/main.yml
+
+
+- job-template:
+ name: 'generate-artifacts-index-pages'
+
+ project-type: freestyle
+
+ disabled: false
+
+ concurrent: false
+
+ parameters:
+ - node:
+ name: SLAVE_NAME
+ description: Build Servers
+ default-slaves:
+ - lf-build2
+ - project-parameter:
+ project: releng
+ branch: master
+
+ scm:
+ - git-scm
+
+ triggers:
+ - timed: '@hourly'
+
+ builders:
+ - generate-artifact-html
+
+
+- builder:
+ name: generate-artifact-html
+ builders:
+ - shell: |
+ cd $WORKSPACE/utils/
+ ./artifacts.opnfv.org.sh
diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index ef99f5abb..6fb6804bc 100644
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -121,6 +121,4 @@
builders:
- shell: |
source /opt/virtualenv/jenkins-job-builder/bin/activate
- cd /opt/jenkins-ci/releng
- git pull
jenkins-jobs update -r --delete-old jjb/
diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml
index 0bca26aa5..fbe2e205a 100644
--- a/jjb/xci/bifrost-periodic-jobs.yml
+++ b/jjb/xci/bifrost-periodic-jobs.yml
@@ -123,7 +123,7 @@
name: SLAVE_LABEL
default: '{slave-label}'
- string:
- name: XCI_LOOP
+ name: CI_LOOP
default: 'periodic'
wrappers:
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index e4c2d0e5b..7e0117565 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -71,7 +71,14 @@
use-build-blocker: true
blocking-jobs:
- 'xci-verify-{distro}-.*'
+ - 'xci-.*-{distro}-merge-.*'
- '.*-bifrost-verify.*-{type}'
+ - throttle:
+ max-per-node: 2
+ max-total: 10
+ categories:
+ - xci-verify-virtual
+ option: category
block-level: 'NODE'
@@ -122,7 +129,7 @@
name: SLAVE_LABEL
default: 'xci-virtual'
- string:
- name: XCI_LOOP
+ name: CI_LOOP
default: 'verify'
scm:
@@ -147,7 +154,7 @@
wrappers:
- fix-workspace-permissions
- build-timeout:
- timeout: 90
+ timeout: 180
publishers:
# yamllint disable rule:line-length
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index 451f33b4b..d3a37ce8a 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -28,7 +28,7 @@ set -o pipefail
cd ~/bifrost
# provision 3 VMs; xcimaster, controller, and compute
-./scripts/bifrost-provision.sh
+./scripts/bifrost-provision.sh | ts
sudo -H -E virsh list
EOF
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index a95374933..a92e49085 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -113,7 +113,7 @@
name: SLAVE_LABEL
default: '{slave-label}'
- string:
- name: XCI_LOOP
+ name: CI_LOOP
default: 'daily'
triggers:
@@ -131,7 +131,7 @@
predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
XCI_FLAVOR=$XCI_FLAVOR
- XCI_LOOP=$XCI_LOOP
+ CI_LOOP=$CI_LOOP
same-node: true
block: true
- trigger-builds:
@@ -140,7 +140,7 @@
predefined-parameters: |
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
XCI_FLAVOR=$XCI_FLAVOR
- XCI_LOOP=$XCI_LOOP
+ CI_LOOP=$CI_LOOP
same-node: true
block: true
block-thresholds:
@@ -214,7 +214,7 @@
name: SLAVE_LABEL
default: '{slave-label}'
- string:
- name: XCI_LOOP
+ name: CI_LOOP
default: 'daily'
- string:
name: INSTALLER_TYPE
diff --git a/jjb/xci/xci-deploy.sh b/jjb/xci/xci-deploy.sh
index 211d282d3..71cf96d8d 100755
--- a/jjb/xci/xci-deploy.sh
+++ b/jjb/xci/xci-deploy.sh
@@ -15,14 +15,14 @@ cd $WORKSPACE/xci
# for daily jobs, we want to use working versions
# for periodic jobs, we will use whatever is set in the job, probably master
-if [[ "$XCI_LOOP" == "daily" ]]; then
+if [[ "$CI_LOOP" == "daily" ]]; then
# source pinned-vars to get releng version
source ./config/pinned-versions
# checkout the version
git checkout -q $OPNFV_RELENG_VERSION
echo "Info: Using $OPNFV_RELENG_VERSION"
-elif [[ "$XCI_LOOP" == "periodic" ]]; then
+elif [[ "$CI_LOOP" == "periodic" ]]; then
echo "Info: Using $OPNFV_RELENG_VERSION"
fi
@@ -31,7 +31,7 @@ fi
# to take this into account while deploying anyways
# clone openstack-ansible
# stable/ocata already use pinned versions so this is only valid for master
-if [[ "$XCI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
+if [[ "$CI_LOOP" == "periodic" && "$OPENSTACK_OSA_VERSION" == "master" ]]; then
cd $WORKSPACE
# get the url to openstack-ansible git
source ./config/env-vars
diff --git a/jjb/xci/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index b8da6128a..492348d63 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -61,8 +61,7 @@
blocking-jobs:
- 'xci-verify-{distro}-.*'
- 'xci-.*-{distro}-merge-.*'
- - 'bifrost-verify-{distro}-.*'
- - 'bifrost-periodic-{distro}-.*'
+ - 'openstack-bifrost-verify-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'
- 'xci-(os|k8s).*?-virtual-{distro}-.*'
@@ -71,7 +70,7 @@
max-per-node: 2
max-total: 10
categories:
- - xci-merge-virtual
+ - xci-verify-virtual
option: category
wrappers:
diff --git a/jjb/xci/xci-start-new-vm.sh b/jjb/xci/xci-start-new-vm.sh
index b72c33920..2c6ec3fad 100755
--- a/jjb/xci/xci-start-new-vm.sh
+++ b/jjb/xci/xci-start-new-vm.sh
@@ -53,7 +53,7 @@ if [[ ! -z ${WORKSPACE+x} && $GERRIT_PROJECT != "releng-xci" ]]; then
fi
cd xci
-./xci-deploy.sh
+./xci-deploy.sh | ts
EOF
chmod a+x xci_test.sh
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 7c6871c22..c6b6bc43b 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -67,8 +67,7 @@
blocking-jobs:
- 'xci-verify-{distro}-.*'
- 'xci-.*-{distro}-merge-.*'
- - 'bifrost-verify-{distro}-.*'
- - 'bifrost-periodic-{distro}-.*'
+ - 'openstack-bifrost-verify-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'
block-level: 'NODE'