Revert "[ONOS-7756] Run onos-1.12 and 1.13 tests with OnosSystemTest 1.13 branch"
This reverts commit fc5cce1cb8abee2850a8cfea942d785fe08e1772.
Change-Id: I427c18dc9feeab3916b5d73d4a9b4c28e6c9d4f3
diff --git a/jjb/OnosSystemTest/onos-test-pipeline.yaml b/jjb/OnosSystemTest/onos-test-pipeline.yaml
index 330640c..c6355dc 100644
--- a/jjb/OnosSystemTest/onos-test-pipeline.yaml
+++ b/jjb/OnosSystemTest/onos-test-pipeline.yaml
@@ -35,6 +35,8 @@
- job-version-plate: &job-version-plate
name: job-version-plate
version:
+ - '1.12'
+ - '1.13'
- 'master'
- 'manually'
@@ -213,76 +215,6 @@
- 'master'
- job-template:
- name: '{type}-pipeline-1.13'
- description: '<!-- Managed by Jenkins Job Builder -->
- This pipeline contains the test results and logs of {type} on ONOS 1.13. <br /><br />
- Visit <a href="https://jenkins.onosproject.org/view/QA/job/all-pipeline-trigger/">all-pipeline-trigger</a> to trigger a build in this pipeline.<br />
- <font color="red">Unless debugging, DO NOT MANUALLY BUILD THIS PIPELINE.</font><br /><br />
- Created by Devin Lim - devin@opennetworking.org<br />
- Copyright (c) 2017 Open Networking Foundation (ONF)'
-
- <<: *test-pipe-job-boiler-plate
-
- parameters:
-
- - string:
- name: TRIGGER_ONLY_WHEN_PREVIOUS_JOB_WAS_BUILT_HERE
- default: 'DO_NOT_MANUALLY_TRIGGER_A_BUILD_HERE'
- description: |
- <a href="https://jenkins.onosproject.org/view/QA/job/all-pipeline-trigger/">all-pipeline-trigger</a> triggers this pipeline automatically.
-
- - lf-infra-parameters:
- project: 'OnosSystemTest'
- branch: 'onos-1.13'
- stream: 'onos-1.13'
- lftools-version: '<1.0.0'
-
- concurrent: false
-
- pipeline-scm:
- script-path: '{jenkins-path}/{type}JenkinsFile'
- scm:
- - git:
- url: '{gitURL}'
- branches:
- - 'onos-1.13'
-
-- job-template:
- name: '{type}-pipeline-1.12'
- description: '<!-- Managed by Jenkins Job Builder -->
- This pipeline contains the test results and logs of {type} on ONOS 1.12. <br /><br />
- Visit <a href="https://jenkins.onosproject.org/view/QA/job/all-pipeline-trigger/">all-pipeline-trigger</a> to trigger a build in this pipeline.<br />
- <font color="red">Unless debugging, DO NOT MANUALLY BUILD THIS PIPELINE.</font><br /><br />
- Created by Devin Lim - devin@opennetworking.org<br />
- Copyright (c) 2017 Open Networking Foundation (ONF)'
-
- <<: *test-pipe-job-boiler-plate
-
- parameters:
-
- - string:
- name: TRIGGER_ONLY_WHEN_PREVIOUS_JOB_WAS_BUILT_HERE
- default: 'DO_NOT_MANUALLY_TRIGGER_A_BUILD_HERE'
- description: |
- <a href="https://jenkins.onosproject.org/view/QA/job/all-pipeline-trigger/">all-pipeline-trigger</a> triggers this pipeline automatically.
-
- - lf-infra-parameters:
- project: 'OnosSystemTest'
- branch: 'onos-1.13'
- stream: 'onos-1.13'
- lftools-version: '<1.0.0'
-
- concurrent: false
-
- pipeline-scm:
- script-path: '{jenkins-path}/{type}JenkinsFile'
- scm:
- - git:
- url: '{gitURL}'
- branches:
- - 'onos-1.13'
-
-- job-template:
name: 'manual-graph-generator-SCPF'
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -509,30 +441,6 @@
- '{type}-pipeline-{version}'
- project:
- name: build-pipeline-1.13
-
- <<: *job-type-plate
-
- project-name: '{type}-pipeline-1.13'
-
- <<: *test-pipe-init-procedure-plate
-
- jobs:
- - '{type}-pipeline-1.13'
-
-- project:
- name: build-pipeline-1.12
-
- <<: *job-type-plate
-
- project-name: '{type}-pipeline-1.12'
-
- <<: *test-pipe-init-procedure-plate
-
- jobs:
- - '{type}-pipeline-1.12'
-
-- project:
name: graph-generator
project-name: 'graph-generator'