summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/container4nfv/arm64/compass-deploy.sh13
-rw-r--r--jjb/container4nfv/container4nfv-arm64.yml23
2 files changed, 28 insertions, 8 deletions
diff --git a/jjb/container4nfv/arm64/compass-deploy.sh b/jjb/container4nfv/arm64/compass-deploy.sh
index bbbf3f449..a22af09ba 100755
--- a/jjb/container4nfv/arm64/compass-deploy.sh
+++ b/jjb/container4nfv/arm64/compass-deploy.sh
@@ -5,9 +5,14 @@ cd compass4nfv
export ADAPTER_OS_PATTERN='(?i)CentOS-7.*arm.*'
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=4 VIRT_MEM=8192 VIRT_DISK=50G
+export KUBERNETES_VERSION="v1.7.5"
+if [[ "$NODE_NAME" =~ "-virtual" ]]; then
+ 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=4 VIRT_MEM=8192 VIRT_DISK=50G
+else
+ export DHA="deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-noha.yml"
+ export NETWORK="deploy/conf/hardware_environment/huawei-pod8/network.yml"
+fi
./deploy.sh
diff --git a/jjb/container4nfv/container4nfv-arm64.yml b/jjb/container4nfv/container4nfv-arm64.yml
index b69c21400..324624387 100644
--- a/jjb/container4nfv/container4nfv-arm64.yml
+++ b/jjb/container4nfv/container4nfv-arm64.yml
@@ -9,15 +9,20 @@
disabled: false
- 'k8-sriov-nofeature-noha':
disabled: false
+ pod:
+ - virtual:
+ slave-label: arm-packet01
+ - baremetal:
+ slave-label: compass-baremetal-arm
jobs:
- - 'container4nfv-{scenario}-virtual-daily-master'
+ - 'container4nfv-{scenario}-{pod}-daily-master'
- job-template:
- name: 'container4nfv-{scenario}-virtual-daily-master'
+ name: 'container4nfv-{scenario}-{pod}-daily-master'
disabled: '{obj:disabled}'
concurrent: false
- node: arm-packet01
+ node: '{slave-label}'
scm:
- git:
@@ -28,7 +33,7 @@
wipe-workspace: true
triggers:
- - 'trigger-{scenario}-virtual'
+ - 'trigger-{scenario}-{pod}'
wrappers:
- timeout:
@@ -46,6 +51,7 @@
same-node: true
block: false
+
- trigger:
name: 'trigger-k8-multus-nofeature-noha-virtual'
triggers:
@@ -54,3 +60,12 @@
name: 'trigger-k8-sriov-nofeature-noha-virtual'
triggers:
- timed: '0 16 * * *'
+
+- trigger:
+ name: 'trigger-k8-multus-nofeature-noha-baremetal'
+ triggers:
+ - timed: '0 16 * * *'
+- trigger:
+ name: 'trigger-k8-sriov-nofeature-noha-baremetal'
+ triggers:
+ - timed: '0 20 * * *'