Merge "Download prebuild shellcheck, rather than using cabal"
diff --git a/jjb/cord-test/cord-test-pipeline.yaml b/jjb/cord-test/cord-test-pipeline.yaml
index bde2bf8..73e36a6 100644
--- a/jjb/cord-test/cord-test-pipeline.yaml
+++ b/jjb/cord-test/cord-test-pipeline.yaml
@@ -1,5 +1,5 @@
---
-# CORD Test Pipeline jobs
+# POD Nightly Build Pipeline Jobs
- test-pipe-job-boiler-plate: &test-pipe-job-boiler-plate
name: test-pipe-job-boiler-plate
@@ -26,100 +26,6 @@
version:
- 'master'
-- job-type-plate: &job-type-plate
- name: job-type-plate
- type:
- - 'verify-api-tests'
-
-- job-repo-plate: &job-repo-plate
- name: job-repo-plate
- repo:
- - 'xos'
- - 'cord'
- - 'platform-install'
- - 'rcord'
- - 'vrouter'
- - 'vsg'
- - 'vtn'
- - 'vtr'
- - 'fabric'
- - 'openstack'
- - 'chameleon'
- - 'exampleservice'
- - 'onos-service'
- - 'olt-service'
- - 'cord-tester'
- - 'vEE'
- - 'vEG'
- - 'mcord'
- - 'vspgwu'
- - 'venb'
- - 'vspgwc'
- - 'vEPC'
- - 'vMME'
- - 'vHSS'
-
-- job-template:
-
- name: 'verify-{repo}-{type}-pipeline-{version}'
- description: |
- <!-- Managed by Jenkins Job Builder -->
- This pipeline contains the test results and logs of {type} on CORD {version}. <br /><br />
- Created by Kailash Khalasi - kailash@opennetworking.org<br />
- Copyright (c) 2017 Open Networking Foundation (ONF)
-
- <<: *test-pipe-job-boiler-plate
-
- parameters:
-
- - string:
- name: GERRIT_CHANGE_NUMBER
- default: '2831'
- description: 'This parameter is required to manually build this pipeline job'
-
- - string:
- name: GERRIT_PATCHSET_NUMBER
- default: '1'
- description: 'This parameter is required to manually build this pipeline job'
-
-
- - string:
- name: RECEIPIENT
- default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
- description: ''
-
- - lf-infra-parameters:
- project: 'CordTest'
- branch: 'master'
- stream: 'master'
- lftools-version: '<1.0.0'
-
- concurrent: true
-
- triggers:
- - gerrit:
- server-name: '{gerrit-server-name}'
- trigger-on:
- - patchset-created-event:
- exclude-drafts: false
- exclude-trivial-rebase: false
- exclude-no-code-change: false
- - draft-published-event
- projects:
- - project-compare-type: PLAIN
- project-pattern: '{repo}'
- branches:
- - branch-compare-type: ANT
- branch-pattern: 'master'
-
- pipeline-scm:
- script-path: '{jenkins-path}/{type}-JenkinsFile'
- scm:
- - git:
- url: '{gitURL}'
- branches:
- - 'master'
-
- job-template:
name: 'automated-nightly-build-qct4-cord-master'
description: |
@@ -131,7 +37,6 @@
<<: *test-pipe-job-boiler-plate
parameters:
-
- string:
name: devNodeName
default: 'qct-cord-pod4'
@@ -171,29 +76,13 @@
H 21 * * *
pipeline-scm:
- script-path: 'build/Jenkinsfile'
+ script-path: 'Jenkinsfile'
scm:
- git:
url: 'https://gerrit.opencord.org/cord'
branches:
- 'master'
-- project:
- name: build-pipeline
-
- <<: *job-type-plate
-
- project-name: '{type}-pipeline'
-
- build-timeout: '60'
- build-node: 'ubuntu16.04-basebuild-1c-2g'
-
- <<: *test-pipe-init-procedure-plate
- <<: *job-version-plate
- <<: *job-repo-plate
-
- jobs:
- - 'verify-{repo}-{type}-pipeline-{version}'
- project:
name: nightly-build-pipeline