Move and refactor: Jenkinsfile-voltha-test -> voltha-physical-tests.groovy
Change-Id: I7cc1079e52a9720a585c285100c66a7078920269
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 728ccad..f565c37 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -903,9 +903,13 @@
Copyright (c) 2017 Open Networking Foundation (ONF)
<<: *test-pipe-job-boiler-plate
+ pipeline-script: 'voltha-physical-functional-tests.groovy'
+ manifest-url: 'https://gerrit.opencord.org/voltha-test-manifest.git'
+ manifest-branch: 'master'
+
parameters:
- string:
- name: TestNodeName
+ name: buildNode
default: '{testvm}'
description: 'Jenkins node name of TestVM Node'
@@ -947,21 +951,23 @@
- string:
name: branch
default: '{branch}'
+ description: 'Branch of the test libraries to check out'
- string:
- name: notificationEmail
- default: 'you@opennetworking.org, suchitra@opennetworking.org'
- description: ''
+ name: manifestUrl
+ default: '{manifest-url}'
+ description: 'Repo manifest URL for code checkout (so we can display changes in Jenkins)'
+
+ - string:
+ name: manifestBranch
+ default: '{manifest-branch}'
+ description: 'Repo manifest branch for code checkout (so we can display changes in Jenkins)'
+
concurrent: true
- pipeline-scm:
- script-path: '{Jenkinsfile}'
- scm:
- - git:
- url: '{gerrit-server-url}/voltha-system-tests'
- branches:
- - '{branch}'
+ project-type: pipeline
+ dsl: !include-raw-escape: ../pipeline/{pipeline-script}
triggers:
- reverse:
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 60bf08f..aad9e57 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -71,7 +71,6 @@
branch: 'master'
test-repo: 'voltha-system-tests'
profile: 'Default'
- Jenkinsfile: 'Jenkinsfile-voltha-test'
# flex OCP pod with olt/onu - uses 1TCONT/4GEMs tech profile on voltha - timer based job
- 'build_voltha_pod_release':
@@ -95,7 +94,6 @@
branch: 'master'
test-repo: 'voltha-system-tests'
profile: '1T4GEM'
- Jenkinsfile: 'Jenkinsfile-voltha-test'
# flex OCP pod with olt/onu - Released versions Default tech profile and timer based job
- 'build_voltha_pod_release':
@@ -119,7 +117,6 @@
branch: 'master'
test-repo: 'voltha-system-tests'
profile: 'Default'
- Jenkinsfile: 'Jenkinsfile-voltha-test'
# Menlo pod with olt/onu - Default tech profile and timer based job
- 'build_voltha_pod_release':
@@ -143,7 +140,6 @@
branch: 'master'
test-repo: 'voltha-system-tests'
profile: 'Default'
- Jenkinsfile: 'Jenkinsfile-voltha-test'
# Menlo pod with olt/onu - 1T4GEM tech profile and timer based job
- 'build_voltha_pod_release':
@@ -167,7 +163,6 @@
branch: 'master'
test-repo: 'voltha-system-tests'
profile: '1T4GEM-bal31'
- Jenkinsfile: 'Jenkinsfile-voltha-test'
# Menlo DEMO-POD - 1 1TCONT 4 4GEMs TechProfile - Manual build and test job
- 'build_pod_manual':