Merge "Removing ONOS before tearing down BBSim in the scale test"
diff --git a/jjb/pipeline/omec-container-remote.groovy b/jjb/pipeline/omec-container-remote.groovy
index 51270f2..81c3c72 100644
--- a/jjb/pipeline/omec-container-remote.groovy
+++ b/jjb/pipeline/omec-container-remote.groovy
@@ -22,7 +22,7 @@
steps {
withCredentials([string(credentialsId: 'aether-jenkins-remote-trigger-token-omec', variable: 'token')]) {
script {
- def handle = triggerRemoteJob job: "${params.project}_premerge_${params.pod}",
+ def handle = triggerRemoteJob job: "${params.project}_premerge_${params.pod}_4g_bess",
parameters: """
ghprbTargetBranch=${params.ghprbTargetBranch}
ghprbPullId=${params.ghprbPullId}
@@ -40,7 +40,7 @@
always {
// Copy artifacts from the remote job dir (make sure both jobs run on the same node)
sh """
- cp -r ../${params.project}_premerge_${params.pod}/* ./
+ cp -r ../${params.project}_premerge_${params.pod}_4g_bess/* ./
"""
archiveArtifacts artifacts: "**/*.*", allowEmptyArchive: true
}
diff --git a/jjb/verify/grpc-robot.yaml b/jjb/verify/grpc-robot.yaml
index e5a14aa..8d13859 100644
--- a/jjb/verify/grpc-robot.yaml
+++ b/jjb/verify/grpc-robot.yaml
@@ -8,9 +8,9 @@
jobs:
- 'verify-grpc-robot-jobs':
branch-regexp: '{supported-branches-regexp}'
-# - 'publish-grpc-robot-jobs':
-# branch-regexp: '{supported-branches-regexp}'
-# pypi-index: 'pypi'
+ - 'publish-grpc-robot-jobs':
+ branch-regexp: '{supported-branches-regexp}'
+ pypi-index: 'pypi'
- job-group:
name: 'verify-grpc-robot-jobs'
@@ -20,9 +20,9 @@
- 'make-unit-test':
junit-allow-empty-results: true
-# - job-group:
-# name: 'publish-grpc-robot-jobs'
-# jobs:
-# - 'pypi-publish':
-# project-regexp: '^{name}$'
-# dependency-jobs: 'version-tag'
+- job-group:
+ name: 'publish-grpc-robot-jobs'
+ jobs:
+ - 'pypi-publish':
+ project-regexp: '^{name}$'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/kafka-robot.yaml b/jjb/verify/kafka-robot.yaml
index 19ae917..9c4b63f 100644
--- a/jjb/verify/kafka-robot.yaml
+++ b/jjb/verify/kafka-robot.yaml
@@ -8,9 +8,9 @@
jobs:
- 'verify-kafka-robot-jobs':
branch-regexp: '{supported-branches-regexp}'
-# - 'publish-kafka-robot-jobs':
-# branch-regexp: '{supported-branches-regexp}'
-# pypi-index: 'pypi'
+ - 'publish-kafka-robot-jobs':
+ branch-regexp: '{supported-branches-regexp}'
+ pypi-index: 'pypi'
- job-group:
name: 'verify-kafka-robot-jobs'
@@ -20,9 +20,9 @@
- 'make-unit-test':
junit-allow-empty-results: true
-# - job-group:
-# name: 'publish-kafka-robot-jobs'
-# jobs:
-# - 'pypi-publish':
-# project-regexp: '^{name}$'
-# dependency-jobs: 'version-tag'
+- job-group:
+ name: 'publish-kafka-robot-jobs'
+ jobs:
+ - 'pypi-publish':
+ project-regexp: '^{name}$'
+ dependency-jobs: 'version-tag'