Merge "Gathering pod, chart and image information from the cluster for HW jobs"
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 4c56478..2fb494f 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -422,6 +422,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'
@@ -437,6 +438,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-openonu-go-test-bbsim.groovy b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
index e3129b8..0b73029 100755
--- a/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
+++ b/jjb/pipeline/voltha-openonu-go-test-bbsim.groovy
@@ -256,7 +256,6 @@
}
stage('Reconcile DT workflow') {
- when { beforeAgent true; expression { return "${olts}" == "1" } }
environment {
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/ReconcileDT"
}
@@ -305,7 +304,6 @@
}
stage('Reconcile ATT workflow') {
- when { beforeAgent true; expression { return "${olts}" == "1" } }
environment {
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/ReconcileATT"
}
@@ -360,7 +358,6 @@
}
stage('Reconcile TT workflow') {
- when { beforeAgent true; expression { return "${olts}" == "1" } }
environment {
ROBOT_LOGS_DIR="$WORKSPACE/RobotLogs/ReconcileTT"
}
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 6b6aa5a..c4d3317 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -192,7 +192,6 @@
withDhcp: true
withIgmp: false
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
- rwCoreImg: matteoscandolo/voltha-rw-core:kafka-retry
onosImg: andreacampanella/voltha-onos:app-update-sadis
# bbsimImg: matteoscandolo/bbsim:id-check
@@ -211,7 +210,6 @@
withDhcp: false
withIgmp: false
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
- rwCoreImg: matteoscandolo/voltha-rw-core:kafka-retry
onosImg: andreacampanella/voltha-onos:app-update-sadis
# bbsimImg: matteoscandolo/bbsim:id-check
@@ -232,7 +230,6 @@
onosReplicas: 3
atomixReplicas: 3
extraHelmFlags: '--set authRetry=true,dhcpRetry=true'
- rwCoreImg: matteoscandolo/voltha-rw-core:kafka-retry
onosImg: andreacampanella/voltha-onos:app-update-sadis
# bbsimImg: matteoscandolo/bbsim:id-check
@@ -255,7 +252,6 @@
withEapol: true
withDhcp: true
withIgmp: false
- rwCoreImg: matteoscandolo/voltha-rw-core:kafka-retry
onosImg: andreacampanella/voltha-onos:app-update-sadis
- 'voltha-scale-measurements':
@@ -276,7 +272,6 @@
withEapol: false
withDhcp: false
withIgmp: false
- rwCoreImg: matteoscandolo/voltha-rw-core:kafka-retry
onosImg: andreacampanella/voltha-onos:app-update-sadis
- 'voltha-scale-measurements':
@@ -297,7 +292,6 @@
withEapol: false
withDhcp: true
withIgmp: true
- rwCoreImg: matteoscandolo/voltha-rw-core:kafka-retry
onosImg: andreacampanella/voltha-onos:app-update-sadis
# voltha-2.6 Jobs