Merge "adding scheduled attwf build+test job for onlab and manual job"
diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index f640d38..149212c 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -9,6 +9,7 @@
build-timeout: '300'
jobs:
+ # onlab pod1 build
- 'build_pod_manual':
testvm: 'onf-build'
config-pod: 'onlab-pod1'
@@ -18,6 +19,25 @@
oltDebVersion: 'openolt-master.deb'
configurePod: true
+ # onlab pod1 build
+ - 'build_pod_timer':
+ testvm: 'onf-build'
+ config-pod: 'onlab-pod1'
+ profile: 'att-workflow'
+ branch: 'master'
+ Jenkinsfile: 'Jenkinsfile-attworkflow-build'
+ oltDebVersion: 'openolt-master.deb'
+ configurePod: true
+ time: '3'
+
+ # onlab pod1 test job
+ - 'build_pod_test':
+ testvm: 'onf-build'
+ config-pod: 'onlab-pod1'
+ profile: 'att-workflow'
+ branch: 'master'
+ Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+
# onlab pod2 build
- 'build_pod_manual':
testvm: 'onf-build'
@@ -28,22 +48,6 @@
oltDebVersion: 'openolt-master.deb'
configurePod: true
- # onlab pod1 test job
- - 'build_pod_test_manual':
- testvm: 'onf-build'
- config-pod: 'onlab-pod1'
- profile: 'att-workflow'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-
- # onlab pod2 test job
- - 'build_pod_test_manual':
- testvm: 'onf-build'
- config-pod: 'onlab-pod2'
- profile: 'att-workflow'
- branch: 'master'
- Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-
# flex pod1 with olt/onu
- 'build_pod_timer':
testvm: 'qa-testvm-pod'
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index 6491736..f97356a 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -15,7 +15,7 @@
- job-template:
- name: 'build_{profile}_{config-pod}_{branch}'
+ name: 'build_{profile}_{config-pod}_{branch}_manual'
id: build_pod_manual
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -254,71 +254,3 @@
- reverse:
jobs: 'build_{profile}_{config-pod}_{branch}'
result: 'success'
-
-
-- job-template:
- name: 'build_{profile}_{config-pod}_{branch}_test'
- id: build_pod_test_manual
- 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/cord-test-pipeline.yaml <br />
- Created by Kailash Khalasi - kailash@opennetworking.org <br />
- Copyright (c) 2017 Open Networking Foundation (ONF)
-
- <<: *test-pipe-job-boiler-plate
-
- 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: configToscaDir
- default: 'tosca-configs'
- description: 'The tosca config folder'
-
- - string:
- name: configFileName
- default: '{config-pod}'
- description: 'The config file'
-
- - string:
- name: branch
- default: '{branch}'
-
- - string:
- name: notificationEmail
- default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
- description: ''
-
- concurrent: true
-
- pipeline-scm:
- script-path: '{Jenkinsfile}'
- scm:
- - git:
- url: '{gerrit-server-url}/cord-tester'
- branches:
- - '{branch}'