summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/armband/armband-ci-jobs.yml89
-rw-r--r--jjb/compass4nfv/compass-ci-jobs.yml27
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml67
-rwxr-xr-xjjb/functest/functest-k8.sh3
-rw-r--r--jjb/qtip/qtip-validate-jobs.yml7
-rwxr-xr-xjjb/xci/bifrost-verify.sh4
-rw-r--r--jjb/xci/osa-periodic-jobs.yml2
-rwxr-xr-xjjb/xci/xci-run-functest.sh4
-rwxr-xr-xjjb/xci/xci-start-deployment.sh2
-rw-r--r--jjb/yardstick/yardstick-daily-jobs.yml2
-rw-r--r--jjb/yardstick/yardstick-project-jobs.yml12
-rwxr-xr-xutils/fetch_k8_conf.sh6
12 files changed, 188 insertions, 37 deletions
diff --git a/jjb/armband/armband-ci-jobs.yml b/jjb/armband/armband-ci-jobs.yml
index da3992ea8..767187de5 100644
--- a/jjb/armband/armband-ci-jobs.yml
+++ b/jjb/armband/armband-ci-jobs.yml
@@ -62,6 +62,8 @@
auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
- 'os-odl-nofeature-ha':
auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-ovs-ha':
+ auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
# NOHA scenarios
- 'os-nosdn-nofeature-noha':
@@ -159,20 +161,60 @@
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
# 1.here the stream means the SUT stream, dovetail stream is defined in its own job
- # 2.only debug testsuite here(refstack, ha, vping, ipv6, tempest, bgpvpn)
- # 3.not used for release criteria or compliance,
+ # 2.testsuite proposed_tests here is for new test cases planning to add into OVP
+ # 3.run proposed_tests on Monday, Wednesday and Friday against ha scenario
+ # 4.testsuite default here is for the test cases already added into OVP
+ # 5.run default testsuite on Tuesday against ha scenario
+ # 6.not used for release criteria or compliance,
# only to debug the dovetail tool bugs with arm pods
- - trigger-builds:
- - project: 'dovetail-{installer}-{pod}-proposed_tests-{stream}'
- current-parameters: false
- predefined-parameters:
- DEPLOY_SCENARIO={scenario}
- block: true
- same-node: true
- block-thresholds:
- build-step-failure-threshold: 'never'
- failure-threshold: 'never'
- unstable-threshold: 'FAILURE'
+ - conditional-step:
+ condition-kind: and
+ condition-operands:
+ - condition-kind: regex-match
+ regex: '*-ha'
+ label: '{scenario}'
+ - condition-kind: day-of-week
+ day-selector: select-days
+ days:
+ MON: true
+ WED: true
+ FRI: true
+ use-build-time: true
+ steps:
+ - trigger-builds:
+ - project: 'dovetail-{installer}-{pod}-proposed_tests-{stream}'
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
+ block: true
+ same-node: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - conditional-step:
+ condition-kind: and
+ condition-operands:
+ - condition-kind: regex-match
+ regex: '*-ha'
+ label: '{scenario}'
+ - condition-kind: day-of-week
+ day-selector: select-days
+ days:
+ TUES: true
+ use-build-time: true
+ steps:
+ - trigger-builds:
+ - project: 'dovetail-{installer}-{pod}-default-{stream}'
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
+ block: true
+ same-node: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
# Armband uses Fuel's log collection project job, no need to duplicate
- conditional-step:
condition-kind: not
@@ -250,7 +292,7 @@
- trigger:
name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger'
triggers:
- - timed: '0 1 * * 2,4,6'
+ - timed: '0 1 * * 4,6'
- trigger:
name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-master-trigger'
triggers:
@@ -258,7 +300,11 @@
- trigger:
name: 'fuel-os-odl-nofeature-ha-armband-baremetal-master-trigger'
triggers:
- - timed: '0 1 * * 1,3,5,7'
+ - timed: '0 1 * * 2,5,7'
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-master-trigger'
+ triggers:
+ - timed: '0 1 * * 1,3'
# ---------------------------------------------------------------------
# Enea Armband CI Baremetal Triggers running against euphrates branch
# ---------------------------------------------------------------------
@@ -274,6 +320,11 @@
name: 'fuel-os-odl-nofeature-ha-armband-baremetal-euphrates-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-euphrates-trigger'
+ triggers:
+ - timed: ''
+
# --------------------------------------------------------------
# Enea Armband CI Virtual Triggers running against master branch
# --------------------------------------------------------------
@@ -289,6 +340,10 @@
name: 'fuel-os-odl-nofeature-ha-armband-virtual-master-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-armband-virtual-master-trigger'
+ triggers:
+ - timed: ''
# -------------------------------------------------------------------
# Enea Armband CI Virtual Triggers running against euphrates branch
# -------------------------------------------------------------------
@@ -304,3 +359,7 @@
name: 'fuel-os-odl-nofeature-ha-armband-virtual-euphrates-trigger'
triggers:
- timed: ''
+- trigger:
+ name: 'fuel-os-nosdn-ovs-ha-armband-virtual-euphrates-trigger'
+ triggers:
+ - timed: ''
diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 7ce9e3a60..357f24e37 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -123,6 +123,9 @@
- 'os-nosdn-bar-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+ - 'os-nosdn-bar-noha':
+ disabled: false
+ auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
- 'k8-nosdn-stor4nfv-ha':
disabled: false
auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
@@ -539,6 +542,10 @@
triggers:
- timed: ''
- trigger:
+ name: 'compass-os-nosdn-bar-noha-baremetal-centos-master-trigger'
+ triggers:
+ - timed: '' # '0 19 * * *'
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-centos-master-trigger'
triggers:
- timed: ''
@@ -632,6 +639,10 @@
triggers:
- timed: ''
- trigger:
+ name: 'compass-os-nosdn-bar-noha-huawei-pod7-danube-trigger'
+ triggers:
+ - timed: '' # '0 19 * * *'
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-huawei-pod7-danube-trigger'
triggers:
- timed: ''
@@ -724,6 +735,10 @@
triggers:
- timed: ''
- trigger:
+ name: 'compass-os-nosdn-bar-noha-baremetal-master-trigger'
+ triggers:
+ - timed: ''
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-master-trigger'
triggers:
- timed: ''
@@ -816,6 +831,10 @@
triggers:
- timed: ''
- trigger:
+ name: 'compass-os-nosdn-bar-noha-baremetal-euphrates-trigger'
+ triggers:
+ - timed: ''
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-baremetal-euphrates-trigger'
triggers:
- timed: ''
@@ -908,6 +927,10 @@
triggers:
- timed: '0 11 2-30/2 * *'
- trigger:
+ name: 'compass-os-nosdn-bar-noha-virtual-master-trigger'
+ triggers:
+ - timed: '0 22 1-29/2 * *'
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-virtual-master-trigger'
triggers:
- timed: '0 10 2-30/2 * *'
@@ -1000,6 +1023,10 @@
triggers:
- timed: '0 12 2-30/2 * *'
- trigger:
+ name: 'compass-os-nosdn-bar-noha-virtual-euphrates-trigger'
+ triggers:
+ - timed: '0 12 1-29/2 * *'
+- trigger:
name: 'compass-k8-nosdn-stor4nfv-noha-virtual-euphrates-trigger'
triggers:
- timed: '' # '0 12 2-30/2 * *'
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index bbc8a8493..26f892d97 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -198,20 +198,59 @@
failure-threshold: 'never'
unstable-threshold: 'FAILURE'
# 1.here the stream means the SUT stream, dovetail stream is defined in its own job
- # 2.only debug testsuite here(refstack, ha, vping, ipv6, tempest, bgpvpn)
- # 3.not used for release criteria or compliance, only to debug the dovetail tool bugs
- # 4.ZTE pod1, os-nosdn-nofeature-ha and os-odl-bgpvpn-ha, run against danube
- - trigger-builds:
- - project: 'dovetail-fuel-{pod}-proposed_tests-{stream}'
- current-parameters: false
- predefined-parameters:
- DEPLOY_SCENARIO={scenario}
- block: true
- same-node: true
- block-thresholds:
- build-step-failure-threshold: 'never'
- failure-threshold: 'never'
- unstable-threshold: 'FAILURE'
+ # 2.testsuite proposed_tests here is for new test cases planning to add into OVP
+ # 3.run proposed_tests on Monday, Wednesday and Friday against ha scenario
+ # 4.testsuite default here is for the test cases already added into OVP
+ # 5.run default testsuite on Tuesday against ha scenario
+ # 6.not used for release criteria or compliance, only to debug the dovetail tool bugs
+ - conditional-step:
+ condition-kind: and
+ condition-operands:
+ - condition-kind: regex-match
+ regex: '*-ha'
+ label: '{scenario}'
+ - condition-kind: day-of-week
+ day-selector: select-days
+ days:
+ MON: true
+ WED: true
+ FRI: true
+ use-build-time: true
+ steps:
+ - trigger-builds:
+ - project: 'dovetail-fuel-{pod}-proposed_tests-{stream}'
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
+ block: true
+ same-node: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
+ - conditional-step:
+ condition-kind: and
+ condition-operands:
+ - condition-kind: regex-match
+ regex: '*-ha'
+ label: '{scenario}'
+ - condition-kind: day-of-week
+ day-selector: select-days
+ days:
+ TUES: true
+ use-build-time: true
+ steps:
+ - trigger-builds:
+ - project: 'dovetail-fuel-{pod}-default-{stream}'
+ current-parameters: false
+ predefined-parameters:
+ DEPLOY_SCENARIO={scenario}
+ block: true
+ same-node: true
+ block-thresholds:
+ build-step-failure-threshold: 'never'
+ failure-threshold: 'never'
+ unstable-threshold: 'FAILURE'
- conditional-step:
condition-kind: not
condition-operand:
diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 888aded81..7c5308d5f 100755
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -18,6 +18,9 @@ if [[ ${INSTALLER_TYPE} == 'compass' ]]; then
echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file
KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2')
echo "export KUBE_MASTER_IP=$KUBE_MASTER_IP" >> $rc_file
+elif [[ ${INSTALLER_TYPE} == 'joid' && ${BRANCH} == 'master' ]]; then
+ admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/joid_config/config"
+ rc_file=${HOME}/joid_config/k8config
else
echo "Not supported by other installers yet"
exit 1
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index 3a487faf7..5c0bb881b 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -27,14 +27,17 @@
- compute:
installer: apex
pod: zte-virtual5
+ sut: node
<<: *master
- storage:
installer: apex
pod: zte-virtual5
+ sut: ''
<<: *master
- compute:
installer: fuel
pod: zte-virtual6
+ sut: vnf
<<: *master
# -------------------------------
@@ -76,6 +79,10 @@
- string:
name: OPNFV_RELEASE
default: '{stream}'
+ - string:
+ name: SUT
+ description: "System Under Test"
+ default: '{sut}'
scm:
- git-scm
diff --git a/jjb/xci/bifrost-verify.sh b/jjb/xci/bifrost-verify.sh
index d3a37ce8a..9219d0020 100755
--- a/jjb/xci/bifrost-verify.sh
+++ b/jjb/xci/bifrost-verify.sh
@@ -46,6 +46,6 @@ export XCI_UPDATE_CLEAN_VM_OS=true
./xci/scripts/vm/start-new-vm.sh $VM_DISTRO
-rsync -a -e "ssh -F $HOME/.ssh/xci-vm-config" $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost
+rsync -a -e "ssh -F $HOME/.ssh/${VM_DISTRO}-xci-vm-config" $WORKSPACE/ ${VM_DISTRO}_xci_vm:~/bifrost
-ssh -F $HOME/.ssh/xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost/releng-xci && ./bifrost_test.sh"
+ssh -F $HOME/.ssh/${VM_DISTRO}-xci-vm-config ${VM_DISTRO}_xci_vm "cd ~/bifrost/releng-xci && ./bifrost_test.sh"
diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml
index 64daa696b..cf4916bde 100644
--- a/jjb/xci/osa-periodic-jobs.yml
+++ b/jjb/xci/osa-periodic-jobs.yml
@@ -234,7 +234,7 @@
- shell: |
#!/bin/bash
- ssh -F $HOME/.ssh/xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
+ ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
- builder:
diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index 39d4ea190..238a833d0 100755
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -39,4 +39,6 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT
exit 0
fi
-ssh -F $HOME/.ssh/xci-vm-config ${DISTRO}_xci_vm "cd releng-xci/xci && PATH=/home/devuser/.local/bin:$PATH ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/run-functest.yml"
+ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "cd releng-xci/xci && PATH=/home/devuser/.local/bin:$PATH ansible-playbook -i installer/osa/files/$XCI_FLAVOR/inventory playbooks/prepare-functest.yml"
+echo "Running functest"
+ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/run-functest.sh"
diff --git a/jjb/xci/xci-start-deployment.sh b/jjb/xci/xci-start-deployment.sh
index cb75b511e..0628829ea 100755
--- a/jjb/xci/xci-start-deployment.sh
+++ b/jjb/xci/xci-start-deployment.sh
@@ -39,4 +39,4 @@ if ! sed -n "/^- scenario: $DEPLOY_SCENARIO$/,/^$/p" $OPNFV_SCENARIO_REQUIREMENT
exit 0
fi
-ssh -F $HOME/.ssh/xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
+ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 481af2a42..20890fa13 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -136,7 +136,7 @@
<<: *euphrates
# daisy CI PODs
- baremetal:
- slave-label: zte-pod3
+ slave-label: daisy-baremetal
installer: daisy
auto-trigger-name: 'daily-trigger-disabled'
<<: *master
diff --git a/jjb/yardstick/yardstick-project-jobs.yml b/jjb/yardstick/yardstick-project-jobs.yml
index e2fee2988..c03666388 100644
--- a/jjb/yardstick/yardstick-project-jobs.yml
+++ b/jjb/yardstick/yardstick-project-jobs.yml
@@ -132,7 +132,9 @@
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
@@ -146,7 +148,9 @@
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 3 ..."
cd $WORKSPACE
@@ -160,7 +164,9 @@
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 functional tests in Python 2.7 ..."
cd $WORKSPACE
@@ -174,7 +180,9 @@
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 functional tests in Python 3 ..."
cd $WORKSPACE
@@ -188,7 +196,9 @@
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 coverage tests ..."
cd $WORKSPACE
@@ -202,7 +212,9 @@
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 style guidelines (PEP8) tests ..."
cd $WORKSPACE
diff --git a/utils/fetch_k8_conf.sh b/utils/fetch_k8_conf.sh
index f82fa5497..32c07f8b6 100755
--- a/utils/fetch_k8_conf.sh
+++ b/utils/fetch_k8_conf.sh
@@ -52,12 +52,14 @@ else
touch $dest_path || error "Cannot create the file specified. Check that the path is correct and run the script again."
fi
-info "Fetching admin.conf file..."
if [ "$installer_type" == "compass" ]; then
+ info "Fetching admin.conf file on Compass"
sudo docker cp compass-tasks:/opt/admin.conf $dest_path &> /dev/null
sudo chown $(whoami):$(whoami) $dest_path
info "Fetch admin.conf successfully"
+elif [ "$installer_type" == "joid" ]; then
+ info "Do nothing, config file has been provided in $HOME/joid_config/config for joid"
else
- error "Installer $installer is not supported by this script"
+ error "Installer $installer_type is not supported by this script"
fi