summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/apex/apex-deploy.sh2
-rw-r--r--jjb/apex/apex-snapshot-deploy.sh2
-rw-r--r--jjb/bottlenecks/bottlenecks-ci-jobs.yml1
-rw-r--r--jjb/bottlenecks/bottlenecks-run-suite.sh3
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml2
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml33
-rw-r--r--jjb/daisy4nfv/daisy-project-jobs.yml4
-rw-r--r--jjb/daisy4nfv/daisy4nfv-merge-jobs.yml4
-rw-r--r--jjb/daisy4nfv/daisy4nfv-verify-jobs.yml4
-rw-r--r--jjb/doctor/doctor.yml10
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml2
-rwxr-xr-xjjb/functest/functest-alpine.sh8
-rw-r--r--jjb/functest/functest-daily-jobs.yml6
-rw-r--r--jjb/releng/opnfv-docker-arm.yml5
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml6
-rw-r--r--jjb/xci/xci-verify-jobs.yml12
16 files changed, 81 insertions, 23 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index bfed67ea5..a79c9e726 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -38,7 +38,7 @@ if [[ "$ARTIFACT_VERSION" =~ dev ]]; then
DEPLOY_SETTINGS_DIR="${WORKSPACE}/config/deploy"
NETWORK_SETTINGS_DIR="${WORKSPACE}/config/network"
DEPLOY_CMD="opnfv-deploy --image-dir ${WORKSPACE}/.build"
- CLEAN_CMD="${WORKSPACE}/ci/clean.sh"
+ CLEAN_CMD="opnfv-clean"
RESOURCES="${WORKSPACE}/.build/"
CONFIG="${WORKSPACE}/build"
BASE=$CONFIG
diff --git a/jjb/apex/apex-snapshot-deploy.sh b/jjb/apex/apex-snapshot-deploy.sh
index 3eb3cf23a..a93421c8e 100644
--- a/jjb/apex/apex-snapshot-deploy.sh
+++ b/jjb/apex/apex-snapshot-deploy.sh
@@ -22,7 +22,7 @@ echo
echo "Cleaning server"
pushd ci > /dev/null
-sudo BASE=../build/ LIB=../lib ./clean.sh
+sudo opnfv-clean
popd > /dev/null
echo "Downloading latest snapshot properties file"
diff --git a/jjb/bottlenecks/bottlenecks-ci-jobs.yml b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
index 74e07b018..bb2a13ccc 100644
--- a/jjb/bottlenecks/bottlenecks-ci-jobs.yml
+++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yml
@@ -89,6 +89,7 @@
- timeout:
timeout: 180
abort: true
+ - fix-workspace-permissions
triggers:
- '{auto-trigger-name}'
diff --git a/jjb/bottlenecks/bottlenecks-run-suite.sh b/jjb/bottlenecks/bottlenecks-run-suite.sh
index 6d4d2d8d1..811f9d58c 100644
--- a/jjb/bottlenecks/bottlenecks-run-suite.sh
+++ b/jjb/bottlenecks/bottlenecks-run-suite.sh
@@ -104,6 +104,9 @@ if [[ $SUITE_NAME == *posca* ]]; then
deactivate
+ sudo rm -rf ${RELENG_REPO}/modules/venv
+ sudo rm -rf ${RELENG_REPO}/modules/opnfv.egg-info
+
set -e
cd ${WORKSPACE}
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 58577790a..aaa5b57e8 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -657,7 +657,7 @@
- trigger:
name: 'compass-k8-nosdn-nofeature-ha-virtual-master-trigger'
triggers:
- - timed: ''
+ - timed: '0 12 * * *'
- trigger:
name: 'compass-os-odl-sfc-ha-virtual-master-trigger'
triggers:
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 9a680e7b8..a9249eaf8 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -19,6 +19,12 @@
branch: '{stream}'
disabled: false
gs-pathname: ''
+ euphrates: &euphrates
+ stream: euphrates
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
+
#--------------------------------
# POD, INSTALLER, AND BRANCH MAPPING
#--------------------------------
@@ -210,3 +216,30 @@
name: 'daisy-os-odl-nofeature-ha-virtual-daily-master-trigger'
triggers:
- timed: '0 12 * * *'
+
+#-----------------------------------------------
+# Triggers for job running on daisy-baremetal against euphrates branch
+#-----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger'
+ triggers:
+ - timed: '0 0 * * *'
+# ODL Scenarios
+- trigger:
+ name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger'
+ triggers:
+ - timed: '0 20 * * *'
+#-----------------------------------------------
+# Triggers for job running on daisy-virtual against euphrates branch
+#-----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+ name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger'
+ triggers:
+ - timed: '0 0 * * *'
+# ODL Scenarios
+- trigger:
+ name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger'
+ triggers:
+ - timed: '0 20 * * *'
diff --git a/jjb/daisy4nfv/daisy-project-jobs.yml b/jjb/daisy4nfv/daisy-project-jobs.yml
index bcb89105e..8ecee7b54 100644
--- a/jjb/daisy4nfv/daisy-project-jobs.yml
+++ b/jjb/daisy4nfv/daisy-project-jobs.yml
@@ -20,6 +20,10 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
+ - euphrates:
+ branch: 'stable/{stream}'
+ gs-pathname: '/{stream}'
+ disabled: false
phase:
- 'build':
diff --git a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
index 97d830f9f..23c6c7b1c 100644
--- a/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-merge-jobs.yml
@@ -18,7 +18,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - danube:
+ - euphrates:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: true
@@ -57,7 +57,7 @@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- - '{alias}-merge-(master|danube)'
+ - '{alias}-merge-(master|euphrates)'
block-level: 'NODE'
scm:
diff --git a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
index 1828ce459..2cf68a99a 100644
--- a/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
+++ b/jjb/daisy4nfv/daisy4nfv-verify-jobs.yml
@@ -15,7 +15,7 @@
branch: '{stream}'
gs-pathname: ''
disabled: false
- - danube:
+ - euphrates:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
disabled: false
@@ -86,6 +86,8 @@
pattern: 'code/**'
- compare-type: ANT
pattern: 'deploy/**'
+ - compare-type: ANT
+ pattern: 'tests/**'
disable-strict-forbidden-file-verification: 'true'
forbidden-file-paths:
- compare-type: ANT
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index b007e1432..7205cded3 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -82,7 +82,7 @@
branch-pattern: '**/{branch}'
file-paths:
- compare-type: ANT
- pattern: 'tests/**'
+ pattern: 'doctor_tests/**'
builders:
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
@@ -108,7 +108,7 @@
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
- files: 'tests/**'
+ files: 'doctor_tests/**'
builders:
- shell: "[ -e tests/run.sh ] && bash -n ./tests/run.sh"
@@ -174,7 +174,7 @@
- '{auto-trigger-name}':
project: '{project}'
branch: '{branch}'
- files: 'tests/**'
+ files: 'doctor_tests/**'
builders:
- 'clean-workspace-log'
@@ -195,11 +195,11 @@
functest_log="$HOME/opnfv/functest/results/{stream}/$FUNCTEST_SUITE_NAME.log"
# NOTE: checking the test result, as the previous job could return
# 0 regardless the result of doctor test scenario.
- grep -e ' OK$' $functest_log || exit 1
+ grep -e 'doctor test successfully' $functest_log || exit 1
publishers:
- archive:
- artifacts: 'tests/*.log'
+ artifacts: 'doctor_tests/*.log'
- archive:
artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log'
- email-jenkins-admins-on-failure
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index c8c3746b0..4bdfa5b01 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -630,7 +630,7 @@
- trigger:
name: 'fuel-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger'
triggers:
- - timed: '0 10 * * *'
+ - timed: '' # '0 10 * * *'
- trigger:
name: 'fuel-os-odl-nofeature-ha-zte-pod3-daily-master-trigger'
triggers:
diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh
index 33a64a414..35311c3a9 100755
--- a/jjb/functest/functest-alpine.sh
+++ b/jjb/functest/functest-alpine.sh
@@ -71,7 +71,11 @@ set +e
if [ ${FUNCTEST_SUITE_NAME} == 'healthcheck' ]; then
tiers=(healthcheck)
else
- tiers=(healthcheck smoke features vnf)
+ if [ ${DEPLOY_TYPE} == 'baremetal' ]; then
+ tiers=(healthcheck smoke features vnf)
+ else
+ tiers=(healthcheck smoke features)
+ fi
fi
cmd_opt='prepare_env start && run_tests -r -t all'
@@ -80,7 +84,7 @@ for tier in ${tiers[@]}; do
FUNCTEST_IMAGE=opnfv/functest-${tier}
echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
docker pull ${FUNCTEST_IMAGE}>/dev/null
- cmd="docker run ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
+ cmd="docker run --privileged=true ${envs} ${volumes} ${FUNCTEST_IMAGE} /bin/bash -c '${cmd_opt}'"
echo "Running Functest tier '${tier}'. CMD: ${cmd}"
eval ${cmd}
done
diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index cbf175567..23c6e490a 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -378,7 +378,6 @@
name: functest-daily-builder
builders:
- 'functest-cleanup'
- - 'set-functest-env-alpine'
- 'functest-daily'
- 'functest-store-results'
@@ -412,7 +411,10 @@
name: functest-daily
builders:
- shell:
- !include-raw: ./functest-alpine.sh
+ !include-raw:
+ - ./functest-env-presetup.sh
+ - ../../utils/fetch_os_creds.sh
+ - ./functest-alpine.sh
- builder:
name: functest-arm-daily
diff --git a/jjb/releng/opnfv-docker-arm.yml b/jjb/releng/opnfv-docker-arm.yml
index ec1d743b9..21d569880 100644
--- a/jjb/releng/opnfv-docker-arm.yml
+++ b/jjb/releng/opnfv-docker-arm.yml
@@ -39,6 +39,7 @@
dockerfile: "Dockerfile.aarch64"
dockerdir: "docker"
+ docker_repo_name: "opnfv/{project}_aarch64"
arch_tag: ""
dockerrepo:
@@ -119,7 +120,7 @@
description: "To enable/disable pushing the image to Dockerhub."
- string:
name: DOCKER_REPO_NAME
- default: "opnfv/{project}_aarch64"
+ default: "{docker_repo_name}"
description: "Dockerhub repo to be pushed to."
- string:
name: RELEASE_VERSION
@@ -127,7 +128,7 @@
description: "Release version, e.g. 1.0, 2.0, 3.0"
- string:
name: DOCKER_DIR
- default: "docker"
+ default: "{dockerdir}"
description: "Directory containing files needed by the Dockerfile"
- string:
name: DOCKERFILE
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index d6eb5ffdb..f9106831c 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -21,19 +21,19 @@
#--------------------------------
distro:
- 'xenial':
- disabled: false
+ disabled: true
dib-os-release: 'xenial'
dib-os-element: 'ubuntu-minimal'
dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
extra-dib-elements: 'openssh-server'
- 'centos7':
- disabled: false
+ disabled: true
dib-os-release: '7'
dib-os-element: 'centos-minimal'
dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
extra-dib-elements: 'openssh-server'
- 'suse':
- disabled: false
+ disabled: true
dib-os-release: '42.3'
dib-os-element: 'opensuse-minimal'
dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index f0a673bd8..324bfd14c 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -90,11 +90,11 @@
disable-strict-forbidden-file-verification: 'true'
file-paths:
- compare-type: ANT
+ pattern: 'bifrost/**'
+ - compare-type: ANT
pattern: 'xci/**'
forbidden-file-paths:
- compare-type: ANT
- pattern: 'bifrost/**'
- - compare-type: ANT
pattern: 'prototypes/**'
- compare-type: ANT
pattern: 'upstream/**'
@@ -112,6 +112,9 @@
name: SLAVE_LABEL
default: 'xci-virtual-{distro}'
- string:
+ name: CLEAN_DIB_IMAGES
+ default: 'true'
+ - string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
@@ -128,6 +131,7 @@
predefined-parameters: |
DISTRO={distro}
DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+ CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
node-parameters: true
kill-phase-on: FAILURE
abort-all-job: true
@@ -140,6 +144,7 @@
predefined-parameters: |
DISTRO={distro}
DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+ CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
FUNCTEST_SUITE_NAME=healthcheck
node-parameters: true
kill-phase-on: NEVER
@@ -179,6 +184,9 @@
name: XCI_FLAVOR
default: 'mini'
- string:
+ name: CLEAN_DIB_IMAGES
+ default: 'true'
+ - string:
name: OPNFV_RELENG_DEV_PATH
default: $WORKSPACE/
- string: