Merge "Rename physical per-patchset test job"
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index d7d3ae8..728ccad 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -877,11 +877,6 @@
default: true
description: "Re-install olt software bringing up CORD"
- - bool:
- name: withPatchset
- default: false
- description: "Apply a Gerrit patchset during the build"
-
concurrent: true
pipeline-scm:
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index db064c7..062e9f3 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -13,26 +13,16 @@
default-image-tag: 'master'
# Per-patchset Pod builds on Tucson pod
- - 'build_physical_voltha_patchset':
+ - 'verify_physical_voltha_patchset':
testvm: 'tucson-pod'
config-pod: 'tucson-pod'
branch: 'master'
- release: 'patchset'
test-repo: 'voltha-system-tests'
- Jenkinsfile: 'Jenkinsfile-voltha-build'
+ Jenkinsfile: 'Jenkinsfile-voltha-build-and-test'
oltDebVersion: 'openolt-seba-2.0.deb'
configurePod: true
profile: 'Default'
- - 'build_physical_voltha_patchset_test':
- testvm: 'tucson-pod'
- config-pod: 'tucson-pod'
- branch: 'master'
- release: 'patchset'
- test-repo: 'voltha-system-tests'
- Jenkinsfile: 'Jenkinsfile-voltha-test'
- profile: 'Default'
-
- job-template:
id: 'voltha-periodic-test'
name: '{name}'
@@ -189,12 +179,12 @@
# POD Per Patchset Pipeline Jobs
- job-template:
- name: 'build_physical_voltha_patchset'
- id: build_physical_voltha_patchset
+ name: 'verify_physical_voltha_patchset'
+ id: verify_physical_voltha_patchset
description: |
<!-- Managed by Jenkins Job Builder -->
- Manual Build on POD {config-pod} using {Jenkinsfile} <br /><br />
- Created from job-template {id} from ci-management/jjb/cord-test/per-patch-pipeline.yaml <br />
+ Automated build on POD {config-pod} using {Jenkinsfile} <br /><br />
+ Created from job-template {id} from ci-management/jjb/voltha-e2e.yaml <br />
Created by Andy Bavier, andy@opennetworking.org <br />
Copyright (c) 2019 Open Networking Foundation (ONF)
project-type: pipeline
@@ -285,16 +275,6 @@
default: true
description: "Re-install OLT software"
- - bool:
- name: withPatchset
- default: true
- description: "Apply a Gerrit patchset during the build"
-
- - bool:
- name: released
- default: false
- description: "Pulls released version images when true"
-
concurrent: true
pipeline-scm:
@@ -318,86 +298,7 @@
comment-contains-value: '^hardware test$'
projects:
- project-compare-type: REG_EXP
- project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server)$'
+ project-pattern: '^(voltha-go|voltha-openolt-adapter|voltha-openonu-adapter|voltha-api-server|voltha-system-tests)$'
branches:
- branch-compare-type: PLAIN
branch-pattern: 'master'
-
-- job-template:
- name: 'build_physical_voltha_patchset_test'
- id: build_physical_voltha_patchset_test
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Post Tests on {config-pod} triggered by build_{config-pod}_{branch} <br /><br />
- Created from job-template {id} from ci-management/jjb/cord-test/per-patch-pipeline.yaml <br />
- Created by Andy Bavier, andy@opennetworking.org <br />
- Copyright (c) 2019 Open Networking Foundation (ONF)
-
- project-type: pipeline
-
- sandbox: true
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
- parameters:
- - string:
- name: TestNodeName
- default: '{testvm}'
- description: 'Jenkins node name of TestVM Node'
-
- - string:
- name: cordRepoUrl
- default: '{gerrit-server-url}'
- description: 'The URL of the CORD Project repository'
-
- - string:
- name: configBaseDir
- default: 'pod-configs'
- description: 'The directory inside the POD configs repository'
-
- - string:
- name: configDeploymentDir
- default: 'deployment-configs'
- description: 'The deployment configs folder'
-
- - string:
- name: configKubernetesDir
- default: 'kubernetes-configs'
- description: 'The kubernetes config folder'
-
- - string:
- name: configFileName
- default: '{config-pod}'
- description: 'The config file'
-
- - string:
- name: profile
- default: '{profile}'
- description: 'Technology Profile pushed to the ETCD'
-
- - string:
- name: branch
- default: '{branch}'
-
- - string:
- name: notificationEmail
- default: 'andy@opennetworking.org'
- description: ''
-
- concurrent: true
-
- pipeline-scm:
- script-path: '{Jenkinsfile}'
- scm:
- - git:
- url: '{gerrit-server-url}/{test-repo}'
- branches:
- - '{branch}'
-
- triggers:
- - reverse:
- jobs: 'build_physical_voltha_patchset'
- result: 'success'