summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/container4nfv/arm64/compass-deploy.sh2
-rw-r--r--jjb/container4nfv/container4nfv-arm64.yml8
-rw-r--r--jjb/daisy4nfv/daisy-daily-jobs.yml22
-rw-r--r--jjb/fuel/fuel-daily-jobs.yml12
-rwxr-xr-xjjb/functest/functest-k8.sh6
-rw-r--r--jjb/global/releng-macros.yml2
-rw-r--r--jjb/releng/releng-ci-jobs.yml2
-rw-r--r--jjb/xci/bifrost-verify-jobs.yml9
-rw-r--r--jjb/xci/xci-merge-jobs.yml10
-rw-r--r--jjb/xci/xci-verify-jobs.yml4
10 files changed, 46 insertions, 31 deletions
diff --git a/jjb/container4nfv/arm64/compass-deploy.sh b/jjb/container4nfv/arm64/compass-deploy.sh
index 3c599279e..bbbf3f449 100755
--- a/jjb/container4nfv/arm64/compass-deploy.sh
+++ b/jjb/container4nfv/arm64/compass-deploy.sh
@@ -8,6 +8,6 @@ export OS_VERSION="centos7"
export KUBERNETES_VERSION="v1.7.3"
export DHA="deploy/conf/vm_environment/k8-nosdn-nofeature-noha.yml"
export NETWORK="deploy/conf/vm_environment/network.yml"
-export VIRT_NUMBER=2 VIRT_CPUS=2 VIRT_MEM=4096 VIRT_DISK=50G
+export VIRT_NUMBER=2 VIRT_CPUS=4 VIRT_MEM=8192 VIRT_DISK=50G
./deploy.sh
diff --git a/jjb/container4nfv/container4nfv-arm64.yml b/jjb/container4nfv/container4nfv-arm64.yml
index 16a10eac1..b69c21400 100644
--- a/jjb/container4nfv/container4nfv-arm64.yml
+++ b/jjb/container4nfv/container4nfv-arm64.yml
@@ -32,7 +32,7 @@
wrappers:
- timeout:
- timeout: 120
+ timeout: 150
fail: true
builders:
@@ -40,7 +40,11 @@
!include-raw: arm64/compass-build.sh
- shell:
!include-raw: arm64/compass-deploy.sh
-
+ - trigger-builds:
+ - project: yardstick-arm64-compass-arm-virtual03-daily-master
+ current-parameters: false
+ same-node: true
+ block: false
- trigger:
name: 'trigger-k8-multus-nofeature-noha-virtual'
diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 6f4643ac8..fbbb086d7 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -32,24 +32,24 @@
# CI PODs
# -------------------------------
pod:
- # - baremetal:
- # slave-label: daisy-baremetal
- # <<: *master
- - virtual:
- slave-label: daisy-virtual
- <<: *master
- baremetal:
slave-label: daisy-baremetal
- <<: *euphrates
+ <<: *master
- virtual:
slave-label: daisy-virtual
- <<: *euphrates
+ <<: *master
+ # - baremetal:
+ # slave-label: daisy-baremetal
+ # <<: *euphrates
+ # - virtual:
+ # slave-label: daisy-virtual
+ # <<: *euphrates
# -------------------------------
# None-CI PODs
# -------------------------------
- - baremetal:
- slave-label: zte-pod3
- <<: *master
+ # - baremetal:
+ # slave-label: zte-pod3
+ # <<: *master
- zte-pod9:
slave-label: zte-pod9
<<: *master
diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index 1cb29d091..bbc8a8493 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -412,11 +412,11 @@
- trigger:
name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger'
triggers:
- - timed: '0 20 * * *'
+ - timed: '' # '0 20 * * *'
- trigger:
name: 'fuel-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger'
triggers:
- - timed: '0 2 * * *'
+ - timed: '' # '0 2 * * *'
- trigger:
name: 'fuel-os-onos-sfc-ha-baremetal-daily-euphrates-trigger'
triggers:
@@ -432,7 +432,7 @@
- trigger:
name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-euphrates-trigger'
triggers:
- - timed: '0 20 * * *'
+ - timed: '' # '0 20 * * *'
- trigger:
name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-euphrates-trigger'
triggers:
@@ -589,11 +589,11 @@
- trigger:
name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger'
triggers:
- - timed: '0 13 * * *'
+ - timed: '' # '0 13 * * *'
- trigger:
name: 'fuel-os-odl-nofeature-noha-virtual-daily-euphrates-trigger'
triggers:
- - timed: '0 18 * * *'
+ - timed: '' # '0 18 * * *'
- trigger:
name: 'fuel-os-onos-sfc-noha-virtual-daily-euphrates-trigger'
triggers:
@@ -613,7 +613,7 @@
- trigger:
name: 'fuel-os-nosdn-ovs-noha-virtual-daily-euphrates-trigger'
triggers:
- - timed: '0 9 * * *'
+ - timed: '' # '0 9 * * *'
- trigger:
name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-euphrates-trigger'
triggers:
diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 6df5c53b0..888aded81 100755
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -11,12 +11,12 @@ rc_file=${HOME}/k8.creds
sudo rm -rf $rc_file
if [[ ${INSTALLER_TYPE} == 'compass' ]]; then
- admin_conf_file_vol = "-v ${HOME}/admin.conf:/root/.kube/config"
+ admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
echo "export KUBECONFIG=/root/.kube/config" >> $rc_file
echo "export KUBERNETES_PROVIDER=local" >> $rc_file
- KUBE_MASTER_URL = $(cat ${HOME}/admin.conf|grep server| awk '{print $2}')
+ KUBE_MASTER_URL=$(cat ${HOME}/admin.conf|grep server| awk '{print $2}')
echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file
- KUBE_MASTER_IP = $(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2')
+ KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2')
echo "export KUBE_MASTER_IP=$KUBE_MASTER_IP" >> $rc_file
else
echo "Not supported by other installers yet"
diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml
index 782cc15e9..a12a3c8a5 100644
--- a/jjb/global/releng-macros.yml
+++ b/jjb/global/releng-macros.yml
@@ -617,7 +617,7 @@
- email-ext:
<<: *email_ptl_defaults
recipients: >
- hongbo.tianhongbo@huawei.com
+ georg.kunz@ericsson.com
- publisher:
name: 'email-dpacc-ptl'
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-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index b662bd1a3..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'
@@ -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/xci-merge-jobs.yml b/jjb/xci/xci-merge-jobs.yml
index 351fe22bb..492348d63 100644
--- a/jjb/xci/xci-merge-jobs.yml
+++ b/jjb/xci/xci-merge-jobs.yml
@@ -60,12 +60,18 @@
use-build-blocker: true
blocking-jobs:
- 'xci-verify-{distro}-.*'
- - 'bifrost-verify-{distro}-.*'
- - 'bifrost-periodic-{distro}-.*'
+ - 'xci-.*-{distro}-merge-.*'
+ - 'openstack-bifrost-verify-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'
- 'xci-(os|k8s).*?-virtual-{distro}-.*'
block-level: 'NODE'
+ - throttle:
+ max-per-node: 2
+ max-total: 10
+ categories:
+ - xci-verify-virtual
+ option: category
wrappers:
- ssh-agent-wrapper
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 3c314568f..c6b6bc43b 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -66,8 +66,8 @@
use-build-blocker: true
blocking-jobs:
- 'xci-verify-{distro}-.*'
- - 'bifrost-verify-{distro}-.*'
- - 'bifrost-periodic-{distro}-.*'
+ - 'xci-.*-{distro}-merge-.*'
+ - 'openstack-bifrost-verify-{distro}-.*'
- 'xci-osa-verify-{distro}-.*'
- 'xci-osa-periodic-{distro}-.*'
block-level: 'NODE'