Merge "[CORD-3206]"
diff --git a/jjb/cord-test/ecord-build.yaml b/jjb/cord-test/ecord-build.yaml
index d038eb3..0194247 100644
--- a/jjb/cord-test/ecord-build.yaml
+++ b/jjb/cord-test/ecord-build.yaml
@@ -9,34 +9,6 @@
build-timeout: '300'
jobs:
- # qct pod 3 build jobs (ecord-global)
- - 'build_pod_first':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-global.yml'
- profile: 'ecord-global'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- time: '20'
- disabled: true
-
- - 'build_pod':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-global.yml'
- profile: 'ecord-global'
- branch: 'cord-5.0'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- fromBranch: 'cord-4.1'
- disabled: true
-
- - 'build_pod':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-global.yml'
- profile: 'ecord-global'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile'
- fromBranch: 'cord-5.0'
- disabled: true
-
# ONLAB ECORD build jobs (ecord-global)
- 'build_ecord_pod_manual':
pod: 'onf-build'
@@ -46,29 +18,6 @@
Jenkinsfile: 'Jenkinsfile.newBuildSystem'
local_pod_name: 'onlab-ecord-global'
- # qct pod 3 test jobs (ecord-global)
- - 'build_pod_test':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-global.yml'
- profile: 'ecord-global'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile-ecord-global'
-
- - 'build_pod_test':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-global.yml'
- profile: 'ecord-global'
- branch: 'cord-5.0'
- Jenkinsfile: 'Jenkinsfile-ecord-global'
-
-
- - 'build_pod_test':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-global.yml'
- profile: 'ecord-global'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile-ecord-global'
-
# ONLAB Global POD test jobs (ecord-global)
- 'build_ecord_pod_manual_test':
pod: 'onf-build'
@@ -78,31 +27,6 @@
Jenkinsfile: 'Jenkinsfile-ecord-global'
local_pod_name: 'onlab_ecord-global'
- # qct pod 3 build jobs (ecord-local)
- - 'build_pod_first':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-local.yml'
- profile: 'ecord-local'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- time: '3'
-
- - 'build_pod':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-local.yml'
- profile: 'ecord-local'
- branch: 'cord-5.0'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- fromBranch: 'cord-4.1'
-
- - 'build_pod':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-local.yml'
- profile: 'ecord-local'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile'
- fromBranch: 'cord-5.0'
-
# ONLAB LOCAL build jobs (ecord-local)
- 'build_ecord_pod_manual':
pod: 'onf-build'
@@ -128,28 +52,6 @@
Jenkinsfile: 'Jenkinsfile.newBuildSystem'
local_pod_name: 'onlab-ecord-local-pod3'
- # qct pod 3 test jobs (ecord-local)
- - 'build_pod_test':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-local.yml'
- profile: 'ecord-local'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile-ecord-local'
-
- - 'build_pod_test':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-local.yml'
- profile: 'ecord-local'
- branch: 'cord-5.0'
- Jenkinsfile: 'Jenkinsfile-ecord-local'
-
- - 'build_pod_test':
- pod: 'qct-pod3'
- pod_config: 'qct-pod3-ecord-local.yml'
- profile: 'ecord-local'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile-ecord-local'
-
# ONLAB Local POD test jobs (ecord-local)
- 'build_ecord_pod_manual_test':
pod: 'onf-build'
diff --git a/jjb/cord-test/rcord-build.yaml b/jjb/cord-test/rcord-build.yaml
index a81b76f..7e4eede 100644
--- a/jjb/cord-test/rcord-build.yaml
+++ b/jjb/cord-test/rcord-build.yaml
@@ -9,39 +9,6 @@
build-timeout: '300'
jobs:
- # qct pod 1 build jobs (rcord)
- - 'build_pod_first':
- pod: 'qct-pod1'
- pod_config: 'qct-pod1.yml'
- profile: 'rcord'
- branch: 'cord-4.0'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- time: '20'
-
- - 'build_pod':
- pod: 'qct-pod1'
- pod_config: 'qct-pod1.yml'
- profile: 'rcord'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- fromBranch: 'cord-4.0'
-
- - 'build_pod':
- pod: 'qct-pod1'
- pod_config: 'qct-pod1.yml'
- profile: 'rcord'
- branch: 'cord-5.0'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- fromBranch: 'cord-4.1'
-
- - 'build_pod':
- pod: 'qct-pod1'
- pod_config: 'qct-pod1.yml'
- profile: 'rcord'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile'
- fromBranch: 'cord-5.0'
-
# Flex POD1 build job for (rcord) - soak platform
- 'build_pod_manual':
pod: 'flex-pod1'
@@ -49,32 +16,3 @@
profile: 'rcord'
branch: 'cord-5.0'
Jenkinsfile: 'Jenkinsfile.newBuildSystem'
-
- # qct pod 1 test jobs
- - 'build_pod_test':
- pod: 'qct-pod1'
- pod_config: 'qct-pod1.yml'
- profile: 'rcord'
- branch: 'cord-4.0'
- Jenkinsfile: 'Jenkinsfile-rcord'
-
- - 'build_pod_test':
- pod: 'qct-pod1'
- pod_config: 'qct-pod1.yml'
- profile: 'rcord'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile-rcord'
-
- - 'build_pod_test':
- pod: 'qct-pod1'
- pod_config: 'qct-pod1.yml'
- profile: 'rcord'
- branch: 'cord-5.0'
- Jenkinsfile: 'Jenkinsfile-rcord'
-
- - 'build_pod_test':
- pod: 'qct-pod1'
- pod_config: 'qct-pod1.yml'
- profile: 'rcord'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile-rcord'