Merge "Tmp fix for multi-stack pipeline"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index c81b093..d270b13 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -152,7 +152,7 @@
Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml<br />
Created by Suchitra Vemuri, suchitra@opennetworking.org <br />
Copyright (c) 2017 Open Networking Foundation (ONF)
- disabled: false
+ disabled: '{disable-job}'
<<: *test-pipe-job-boiler-plate
@@ -259,6 +259,8 @@
- job-template:
name: 'build_{profile}_{config-pod}_{branch}_test'
id: build_pod_test
+
+ disabled: '{disable-job}'
description: |
Post Tests on {config-pod} triggered by build_{config-pod}_{branch}, using {Jenkinsfile}<br /><br />
Created from job-template {id} from ci-management/jjb/cord-test/nightly-build-pipeline.yaml <br />
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 7a66696..ed891f5 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -247,7 +247,6 @@
Jenkinsfile: 'Jenkinsfile-voltha-build'
configurePod: true
profile: '1T4GEM'
- in-band-management: true
time: '18'
@@ -260,7 +259,6 @@
branch: 'master'
test-repo: 'voltha-system-tests'
profile: '1T4GEM'
- in-band-management: true
power-switch: True
# Menlo pod with olt/onu - Default tech profile and timer based job
@@ -465,11 +463,38 @@
test-repo: 'voltha-system-tests'
Jenkinsfile: 'Jenkinsfile-voltha-test'
+
+ # Soak pod with xgs-pon olt/onu - master 1T4GEM tech profile and openonu go and timer based job
+ - 'build_voltha_pod_release_timer':
+ build-node: 'menlo-soak-pod'
+ config-pod: 'onf-soak-pod-openonugo'
+ release: 'master'
+ branch: 'master'
+ name-extension: '_openonugo'
+ test-repo: 'voltha-system-tests'
+ Jenkinsfile: 'Jenkinsfile-voltha-build'
+ configurePod: true
+ profile: '1T4GEM'
+ time: '1'
+
+
+ # Soak POD test job - master versions, uses 1T4GEM tech profile and openonu go on voltha branch
+ - 'build_voltha_pod_test':
+ build-node: 'menlo-soak-pod'
+ config-pod: 'onf-soak-pod-openonugo'
+ name-extension: '_openonugo'
+ release: 'master'
+ branch: 'master'
+ test-repo: 'voltha-system-tests'
+ profile: '1T4GEM'
+
+ # Menlo pod with olt/onu - Default tech profile and timer based job
# ONF Menlo Soak POD build job - voltha-master branch
# FIXME once the soak-pod is back use 'build_voltha_pod_release_timer'
- 'build_pod_manual':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
+ 'disable-job': true
release: 'master'
branch: 'master'
profile: '1T8GEM'
@@ -484,6 +509,7 @@
- 'build_pod_test':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
+ 'disable-job': true
profile: 'Default'
branch: 'master'
test-repo: 'voltha-system-tests'
@@ -494,6 +520,7 @@
- 'build_voltha_pod_soak_test':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
+ 'disable-job': true
profile: '1T8GEM'
branch: 'master'
release: 'master'
@@ -509,6 +536,7 @@
- 'build_voltha_pod_soak_test':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
+ 'disable-job': true
profile: '1T8GEM'
branch: 'master'
release: 'master'
@@ -524,6 +552,7 @@
- 'build_voltha_pod_soak_test':
build-node: 'menlo-soak-pod'
config-pod: 'onf-soak-pod'
+ 'disable-job': true
profile: '1T8GEM'
branch: 'master'
release: 'master'
diff --git a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
index 606ebcc..48af5c5 100644
--- a/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
+++ b/jjb/pipeline/voltha-nightly-tests-bbsim.groovy
@@ -23,7 +23,7 @@
label "${params.buildNode}"
}
options {
- timeout(time: 90, unit: 'MINUTES')
+ timeout(time: 190, unit: 'MINUTES')
}
environment {
KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
diff --git a/jjb/pipeline/voltha-scale-test-etcd-kafka-bitnami.groovy b/jjb/pipeline/voltha-scale-test-etcd-kafka-bitnami.groovy
index d97f325..e605443 100644
--- a/jjb/pipeline/voltha-scale-test-etcd-kafka-bitnami.groovy
+++ b/jjb/pipeline/voltha-scale-test-etcd-kafka-bitnami.groovy
@@ -651,7 +651,7 @@
curl -s -X GET -G http://10.90.0.201:31301/api/v1/query --data-urlencode 'query=etcd_disk_backend_commit_duration_seconds_sum' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-backend-write-time-sum.json || true
curl -s -X GET -G http://10.90.0.201:31301/api/v1/query --data-urlencode 'query=etcd_disk_backend_commit_duration_seconds_bucket' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-backend-write-time-bucket.json || true
curl -s -X GET -G http://10.90.0.201:31301/api/v1/query --data-urlencode 'query=etcd_disk_wal_fsync_duration_seconds_bucket' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-wal-fsync-time-bucket.json || true
- curl -s -X GET -G http://10.90.0.201:31301/api/v1/query --data-urlencode 'query=etcd_network_peer_round_trip_time_seconds_bucket' | jq '.data' > etcd-network-peer-round-trip-time-seconds.json || true
+ curl -s -X GET -G http://10.90.0.201:31301/api/v1/query --data-urlencode 'query=etcd_network_peer_round_trip_time_seconds_bucket' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-network-peer-round-trip-time-seconds.json || true
'''
// get VOLTHA debug infos
script {
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 51f9b17..af19130 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -662,6 +662,8 @@
curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_disk_backend_commit_duration_seconds_sum' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-backend-write-time-sum.json || true
curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_disk_backend_commit_duration_seconds_bucket' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-backend-write-time-bucket.json || true
curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_disk_wal_fsync_duration_seconds_bucket' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-wal-fsync-time-bucket.json || true
+ curl -s -X GET -G http://10.90.0.101:31301/api/v1/query --data-urlencode 'query=etcd_network_peer_round_trip_time_seconds_bucket' | jq '.data' > $WORKSPACE/etcd-metrics/etcd-network-peer-round-trip-time-seconds.json || true
+
'''
// get VOLTHA debug infos
script {
diff --git a/jjb/voltha-test/voltha-nightly-jobs.yaml b/jjb/voltha-test/voltha-nightly-jobs.yaml
index 7963155..8a7031e 100644
--- a/jjb/voltha-test/voltha-nightly-jobs.yaml
+++ b/jjb/voltha-test/voltha-nightly-jobs.yaml
@@ -317,6 +317,7 @@
- job-template:
name: 'build_{config-pod}_{profile}_voltha{name-extension}_{release}_test'
id: build_voltha_pod_soak_test
+ disabled: '{disable-job}'
description: |
Post Tests on {config-pod} triggered by build_{config-pod}_{branch}, using {pipeline-script}<br /><br />
Created from job-template {id} from ci-management/jjb/voltha-test/voltha-nightly-jobs.yaml <br />