updating jjb templates for new builds and removing obsolete templates/jobs
Change-Id: I0d5d73937596ce824a3aacf46d24f276ebf1ac7e
diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index e4ef9bc..2cd21aa 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -10,20 +10,20 @@
jobs:
- 'build_pod_manual':
- pod: 'onf-build'
- pod_config: 'onlab-pod1.yml'
+ testvm: 'onf-build'
+ config-pod: 'onlab-pod1'
profile: 'att-workflow'
branch: 'master'
+ scenario: ''
Jenkinsfile: 'Jenkinsfile-att-workflow'
+ oltDebVersion: 'openolt-master.deb'
- # flex pod1 with olt/onu
- - 'build_kube_pod_first':
+ # flex pod1 with olt/onu
+ - 'build_pod_manual':
testvm: 'qa-testvm-pod'
- kube-pod: 'flex-pod1-olt'
+ config-pod: 'flex-pod1-olt'
profile: 'att-workflow'
branch: 'master'
scenario: ''
Jenkinsfile: 'Jenkinsfile-attworkflow'
oltDebVersion: 'openolt-master.deb'
- time: '50'
- day: '1-31/2'
diff --git a/jjb/cord-test/ecord-build.yaml b/jjb/cord-test/ecord-build.yaml
deleted file mode 100644
index 0194247..0000000
--- a/jjb/cord-test/ecord-build.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-# POD Nightly Build Pipeline E-CORD Jobs
-
-- project:
- name: ecord-nightly-build-pipeline
-
- project-name: '{name}'
-
- build-timeout: '300'
-
- jobs:
- # ONLAB ECORD build jobs (ecord-global)
- - 'build_ecord_pod_manual':
- pod: 'onf-build'
- pod_config: 'onlab-ecord-global.yml'
- profile: 'ecord-global'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- local_pod_name: 'onlab-ecord-global'
-
- # ONLAB Global POD test jobs (ecord-global)
- - 'build_ecord_pod_manual_test':
- pod: 'onf-build'
- pod_config: 'onlab-ecord-global.yml'
- profile: 'ecord-global'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile-ecord-global'
- local_pod_name: 'onlab_ecord-global'
-
- # ONLAB LOCAL build jobs (ecord-local)
- - 'build_ecord_pod_manual':
- pod: 'onf-build'
- pod_config: 'onlab-ecord-local-pod1.yml'
- profile: 'ecord-local'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- local_pod_name: 'onlab-ecord-local-pod1'
-
- - 'build_ecord_pod_manual':
- pod: 'onf-build'
- pod_config: 'onlab-ecord-local-pod2.yml'
- profile: 'ecord-local'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- local_pod_name: 'onlab-ecord-local-pod2'
-
- - 'build_ecord_pod_manual':
- pod: 'onf-build'
- pod_config: 'onlab-ecord-local-pod3.yml'
- profile: 'ecord-local'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
- local_pod_name: 'onlab-ecord-local-pod3'
-
- # ONLAB Local POD test jobs (ecord-local)
- - 'build_ecord_pod_manual_test':
- pod: 'onf-build'
- pod_config: 'onlab-ecord-local-pod1.yml'
- profile: 'ecord-local'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile-ecord-local'
- local_pod_name: 'onlab-ecord-local-pod1'
-
- - 'build_ecord_pod_manual_test':
- pod: 'onf-build'
- pod_config: 'onlab-ecord-local-pod2.yml'
- profile: 'ecord-local'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile-ecord-local'
- local_pod_name: 'onlab-ecord-local-pod2'
-
- - 'build_ecord_pod_manual_test':
- pod: 'onf-build'
- pod_config: 'onlab-ecord-local-pod3.yml'
- profile: 'ecord-local'
- branch: 'cord-4.1'
- Jenkinsfile: 'Jenkinsfile-ecord-local'
- local_pod_name: 'onlab-ecord-local-pod3'
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index c842d8d..5918318 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -13,187 +13,13 @@
build-days-to-keep: '{build-days-to-keep}'
artifact-num-to-keep: '{artifact-num-to-keep}'
-- job-template:
- name: 'build_{profile}_{pod}_{branch}'
- id: build_pod_first
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Nightly Physical POD Builds at {pod} using {pod_config} <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: devNodeName
- default: '{pod}'
- description: 'Jenkins node name of Dev Node'
-
- - string:
- name: configRepoUrl
- default: 'https://gerrit.opencord.org/pod-configs'
- description: 'The URL of the POD configs repository'
-
- - string:
- name: configRepoBaseDir
- default: 'pod-configs/'
- description: 'The directory inside the POD configs repository'
-
- - string:
- name: configRepoFile
- default: 'deployment-configs/{pod_config}'
- description: 'The deployment 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'
- branches:
- - '{branch}'
-
- triggers:
- - timed: |
- TZ=America/Los_Angeles
- H {time} * * *
-
- job-template:
- name: 'build_{profile}_{pod}_{branch}'
- id: build_pod
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Nightly Physical POD Builds at {pod} using {pod_config} <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: devNodeName
- default: '{pod}'
- description: 'Jenkins node name of Dev Node'
-
- - string:
- name: configRepoUrl
- default: 'https://gerrit.opencord.org/pod-configs'
- description: 'The URL of the POD configs repository'
-
- - string:
- name: configRepoBaseDir
- default: 'pod-configs/'
- description: 'The directory inside the POD configs repository'
-
- - string:
- name: configRepoFile
- default: 'deployment-configs/{pod_config}'
- description: 'The deployment 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'
- branches:
- - '{branch}'
-
- triggers:
- - reverse:
- jobs: 'build_{profile}_{pod}_{fromBranch}_test'
- result: 'failure'
-
-
-- job-template:
- name: 'build_{profile}_{pod}_{branch}_test'
- id: build_pod_test
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Post Tests on {pod} triggered by build_{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)
-
- branches: '{branch}'
-
- <<: *test-pipe-job-boiler-plate
-
- parameters:
- - string:
- name: devNodeName
- default: '{pod}'
- description: 'Jenkins node name of Dev Node'
-
- - string:
- name: configRepoUrl
- default: 'https://gerrit.opencord.org/pod-configs'
- description: 'The URL of the POD configs repository'
-
- - string:
- name: configRepoBaseDir
- default: 'pod-configs/'
- description: 'The directory inside the POD configs repository'
-
- - string:
- name: configRepoFile
- default: 'deployment-configs/{pod_config}'
- description: 'The deployment 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}'
-
- triggers:
- - reverse:
- jobs: 'build_{profile}_{pod}_{branch}'
- result: 'failure'
-
-- job-template:
- name: 'build_{profile}_{pod}_{branch}'
+ name: 'build_{profile}_{testvm}_{scenario}_{branch}'
id: build_pod_manual
description: |
<!-- Managed by Jenkins Job Builder -->
- Manual Build on POD {pod} using {pod_config} <br /><br />
+ Manual Build on POD {config-pod} using {Jenkinsfile} <br /><br />
Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
Copyright (c) 2018 Open Networking Foundation (ONF)
@@ -203,23 +29,38 @@
parameters:
- string:
name: TestNodeName
- default: '{pod}'
- description: 'Jenkins node name of Dev Node'
+ default: '{testvm}'
+ description: 'Jenkins node name of TestVM Node'
- string:
- name: configRepoUrl
- default: 'https://gerrit.opencord.org/pod-configs'
- description: 'The URL of the POD configs repository'
+ name: cordRepoUrl
+ default: '{gerrit-server-url}'
+ description: 'The URL of the CORD Project repository'
- string:
- name: configRepoBaseDir
- default: 'pod-configs/'
+ name: configBaseDir
+ default: 'pod-configs'
description: 'The directory inside the POD configs repository'
- string:
- name: configRepoFile
- default: 'deployment-configs/{pod_config}'
- description: 'The deployment config file'
+ 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: oltDebVersion
+ default: '{oltDebVersion}'
+ description: 'OLT Software version to install'
- string:
name: branch
@@ -241,181 +82,11 @@
- '{branch}'
- job-template:
- name: 'build_{profile}_{pod}_{branch}_test'
- id: build_pod_manual_test
+ name: 'build_{profile}_{config-pod}_{scenario}_{branch}'
+ id: build_pod_timer
description: |
<!-- Managed by Jenkins Job Builder -->
- Post Tests on {pod} triggered by build_{pod}_{branch} <br /><br />
- Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
- Created by QA (Suchitra Vemuri - suchitra@opennetworking.org) <br />
- Copyright (c) 2017 Open Networking Foundation (ONF)
-
- branches: '{branch}'
-
- <<: *test-pipe-job-boiler-plate
-
- parameters:
- - string:
- name: devNodeName
- default: '{pod}'
- description: 'Jenkins node name of Dev Node'
-
- - string:
- name: configRepoUrl
- default: 'https://gerrit.opencord.org/pod-configs'
- description: 'The URL of the POD configs repository'
-
- - string:
- name: configRepoBaseDir
- default: 'pod-configs/'
- description: 'The directory inside the POD configs repository'
-
- - string:
- name: configRepoFile
- default: 'deployment-configs/{pod_config}'
- description: 'The deployment 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}'
-
- triggers:
- - reverse:
- jobs: 'build_{profile}_{pod}_manual_{branch}'
- result: 'failure'
-
-- job-template:
- name: 'build_{profile}_{local_pod_name}_{branch}'
- id: build_ecord_pod_manual
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Manual Build on ECORD POD {pod} using {pod_config} <br /><br />
- Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
- Created by QA (Suchitra Vemuri - suchitra@opennetworking.org ) <br />
- Copyright (c) 2018 Open Networking Foundation (ONF)
-
- <<: *test-pipe-job-boiler-plate
-
- parameters:
- - string:
- name: devNodeName
- default: '{pod}'
- description: 'Jenkins node name of Dev Node'
-
- - string:
- name: configRepoUrl
- default: 'https://gerrit.opencord.org/pod-configs'
- description: 'The URL of the POD configs repository'
-
- - string:
- name: configRepoBaseDir
- default: 'pod-configs/'
- description: 'The directory inside the POD configs repository'
-
- - string:
- name: configRepoFile
- default: 'deployment-configs/{pod_config}'
- description: 'The deployment 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'
- branches:
- - '{branch}'
-
-- job-template:
- name: 'build_{profile}_{local_pod_name}_{branch}_test'
- id: build_ecord_pod_manual_test
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Post Tests on {pod} triggered by build_{pod}_{branch} <br /><br />
- Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
- Created by QA (Suchitra Vemuri - suchitra@opennetworking.org) <br />
- Copyright (c) 2017 Open Networking Foundation (ONF)
-
- branches: '{branch}'
-
- <<: *test-pipe-job-boiler-plate
-
- parameters:
- - string:
- name: devNodeName
- default: '{pod}'
- description: 'Jenkins node name of Dev Node'
-
- - string:
- name: configRepoUrl
- default: 'https://gerrit.opencord.org/pod-configs'
- description: 'The URL of the POD configs repository'
-
- - string:
- name: configRepoBaseDir
- default: 'pod-configs/'
- description: 'The directory inside the POD configs repository'
-
- - string:
- name: configRepoFile
- default: 'deployment-configs/{pod_config}'
- description: 'The deployment 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}'
-
- triggers:
- - reverse:
- jobs: 'build_{profile}_{pod}_manual_{branch}'
- result: 'failure'
-
-- job-template:
- name: 'build_{profile}_{kube-pod}_{scenario}_{branch}'
- id: build_kube_pod_first
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Nightly Kubernetes tests on {kube-pod} <br /><br />
+ Nightly Kubernetes tests on {config-pod} <br /><br />
Created from job-template {id} from ci-management/jjb/cord-test/cord-test-pipeline.yaml <br />
Created by Suchitra Vemuri, suchitra@opennetworking.org <br />
Copyright (c) 2017 Open Networking Foundation (ONF)
@@ -429,19 +100,29 @@
description: 'Jenkins node name of TestVM Node'
- string:
- name: configRepoUrl
- default: 'https://gerrit.opencord.org/pod-configs'
- description: 'The URL of the POD configs repository'
+ name: cordRepoUrl
+ default: '{gerrit-server-url}'
+ description: 'The URL of the CORD Project repository'
- string:
- name: configRepoBaseDir
- default: 'pod-configs/'
+ name: configBaseDir
+ default: 'pod-configs'
description: 'The directory inside the POD configs repository'
- string:
- name: configRepoFile
- default: 'deployment-configs/{kube-pod}.yml'
- description: 'The deployment config file'
+ 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: oltDebVersion
diff --git a/jjb/cord-test/rcord-build.yaml b/jjb/cord-test/rcord-build.yaml
deleted file mode 100644
index 7e4eede..0000000
--- a/jjb/cord-test/rcord-build.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-# POD Nightly Build Pipeline R-CORD Jobs
-
-- project:
- name: rcord-nightly-build-pipeline
-
- project-name: '{name}'
-
- build-timeout: '300'
-
- jobs:
- # Flex POD1 build job for (rcord) - soak platform
- - 'build_pod_manual':
- pod: 'flex-pod1'
- pod_config: 'flex-pod1.yml'
- profile: 'rcord'
- branch: 'cord-5.0'
- Jenkinsfile: 'Jenkinsfile.newBuildSystem'
diff --git a/jjb/cord-test/rcord-lite.yaml b/jjb/cord-test/rcord-lite.yaml
index 99f3dab..951ef6e 100644
--- a/jjb/cord-test/rcord-lite.yaml
+++ b/jjb/cord-test/rcord-lite.yaml
@@ -10,9 +10,9 @@
jobs:
# flex onf pod 1 kubernetes build jobs (rcord lite)
- - 'build_kube_pod_first':
+ - 'build_pod_timer':
testvm: 'qa-testvm-pod'
- kube-pod: 'flex-onf-pod1'
+ config-pod: 'flex-onf-pod1'
profile: 'rcord-lite'
scenario: ''
branch: 'master'
@@ -22,9 +22,9 @@
day: '0-31/1'
# flex pod1 with olt/onu kubernetes build jobs (rcord lite)
- - 'build_kube_pod_first':
+ - 'build_pod_timer':
testvm: 'qa-testvm-pod'
- kube-pod: 'flex-pod1-olt'
+ config-pod: 'flex-pod1-olt'
profile: 'rcord-lite'
branch: 'cord-6.0'
scenario: 'zerotouch'
@@ -34,9 +34,9 @@
day: '1-31/2'
# flex pod1 with olt/onu kubernetes build jobs (rcord lite)
- - 'build_kube_pod_first':
+ - 'build_pod_timer':
testvm: 'qa-testvm-pod'
- kube-pod: 'flex-pod1-olt'
+ config-pod: 'flex-pod1-olt'
profile: 'rcord-lite'
branch: 'cord-6.0'
scenario: 'topdown'
@@ -46,9 +46,9 @@
day: '2-30/2'
# qct pod1 kubernetes build jobs (rcord lite)
- - 'build_kube_pod_first':
+ - 'build_pod_timer':
testvm: 'qct-pod1'
- kube-pod: 'qct-pod1'
+ config-pod: 'qct-pod1'
profile: 'rcord-lite'
branch: 'master'
scenario: ''
@@ -58,9 +58,9 @@
day: '*'
# flex ocp pod 2 kubernetes build jobs (rcord lite)
- - 'build_kube_pod_first':
+ - 'build_pod_timer':
testvm: 'flex-pod2'
- kube-pod: 'flex-ocp-pod2'
+ config-pod: 'flex-ocp-pod2'
profile: 'rcord-lite'
scenario: ''
branch: 'master'