Merge "[CORD-2966] helm-api-test job for containerized testing of xos-core"
diff --git a/jjb/cord-test/mcord-build.yaml b/jjb/cord-test/mcord-build.yaml
index 1dff29c..bad837f 100644
--- a/jjb/cord-test/mcord-build.yaml
+++ b/jjb/cord-test/mcord-build.yaml
@@ -12,7 +12,7 @@
# qct pod 4 build jobs (mcord)
- 'build_pod_manual':
pod: 'qct-pod4'
- pod_config: 'qct-pod4.yml'
+ pod_config: 'qct-pod4-mcord.yml'
profile: 'mcord'
branch: 'cord-4.1'
Jenkinsfile: 'Jenkinsfile.newBuildSystem'
@@ -20,7 +20,7 @@
# qct pod 4 test jobs
- 'build_pod_manual_test':
pod: 'qct-pod4'
- pod_config: 'qct-pod4.yml'
+ pod_config: 'qct-pod4-mcord.yml'
profile: 'mcord'
branch: 'cord-4.1'
Jenkinsfile: 'Jenkinsfile-mcord'
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index f82b78d..0e53f9b 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -189,11 +189,11 @@
result: 'failure'
- job-template:
- name: 'build_{profile}_{pod}_manual_{branch}'
+ name: 'build_{profile}_{pod}_{branch}'
id: build_pod_manual
description: |
<!-- Managed by Jenkins Job Builder -->
- Nightly Physical POD Builds at {pod} using {pod_config} <br /><br />
+ Manual Build on 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)
diff --git a/jjb/aaa.yaml b/jjb/maven.yaml
similarity index 68%
rename from jjb/aaa.yaml
rename to jjb/maven.yaml
index 4f0a33f..02195e3 100644
--- a/jjb/aaa.yaml
+++ b/jjb/maven.yaml
@@ -1,22 +1,12 @@
---
-# maven job for 'aaa' repo
-
-- project:
- name: aaa
-
- project-name: '{name}'
-
- jobs:
- - 'aaa':
- branch-regexp: '{supported-branches-regexp}'
-
+# maven install jobs for cord onos app repos
- job-template:
- id: aaa
- name: 'aaa-gerrit'
+ id: maven-install
+ name: '{project}-gerrit'
description: |
<!-- Managed by Jenkins Job Builder -->
- Created by {id} job-template from ci-management/jjb/aaa.yaml
+ Created by {id} job-template from ci-management/jjb/maven.yaml
node: 'ubuntu16.04-basebuild-1c-2g'
project-type: maven
@@ -26,19 +16,19 @@
parameters:
- string:
- name: GERRIT_REFSPEC
- default: 'refs/heads/master'
+ name: GERRIT_BRANCH
+ default: 'master'
description: 'Use default when using "Build Now"'
- string:
- name: GERRIT_BRANCH
- default: 'master'
+ name: GERRIT_REFSPEC
+ default: 'refs/heads/master'
description: 'Use default when using "Build Now"'
triggers:
- cord-infra-gerrit-trigger-patchset:
gerrit-server-name: '{gerrit-server-name}'
- project-regexp: 'aaa'
+ project-regexp: '{project}'
branch-regexp: '{branch-regexp}'
file-include-regexp: '{all-files-regexp}'
dependency-jobs: '{dependency-jobs}'
@@ -47,3 +37,12 @@
- cord-infra-properties:
build-days-to-keep: '{build-days-to-keep}'
artifact-num-to-keep: '{artifact-num-to-keep}'
+
+ scm:
+ - git:
+ url: '{gerrit-server-url}/{project}'
+ branches:
+ - '$GERRIT_BRANCH'
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+ shallow-clone: true
diff --git a/jjb/maven/aaa.yaml b/jjb/maven/aaa.yaml
new file mode 100644
index 0000000..9a86551
--- /dev/null
+++ b/jjb/maven/aaa.yaml
@@ -0,0 +1,16 @@
+---
+# maven job for 'aaa' repo
+
+- project:
+ name: aaa
+ project: '{name}'
+
+ jobs:
+ - 'aaa-gerrit':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'aaa-gerrit'
+ jobs:
+ - 'verify-licensed'
+ - 'maven-install'
diff --git a/jjb/maven/config.yaml b/jjb/maven/config.yaml
new file mode 100644
index 0000000..d865397
--- /dev/null
+++ b/jjb/maven/config.yaml
@@ -0,0 +1,16 @@
+---
+# maven job for 'config' repo
+
+- project:
+ name: config
+ project: '{name}'
+
+ jobs:
+ - 'config-gerrit':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'config-gerrit'
+ jobs:
+ - 'verify-licensed'
+ - 'maven-install'
diff --git a/jjb/maven/dhcpl2relay.yaml b/jjb/maven/dhcpl2relay.yaml
new file mode 100644
index 0000000..93c3648
--- /dev/null
+++ b/jjb/maven/dhcpl2relay.yaml
@@ -0,0 +1,16 @@
+---
+# maven job for 'dhcpl2relay' repo
+
+- project:
+ name: dhcpl2relay
+ project: '{name}'
+
+ jobs:
+ - 'dhcpl2relay-gerrit':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'dhcpl2relay-gerrit'
+ jobs:
+ - 'verify-licensed'
+ - 'maven-install'
diff --git a/jjb/maven/igmp.yaml b/jjb/maven/igmp.yaml
new file mode 100644
index 0000000..438e78b
--- /dev/null
+++ b/jjb/maven/igmp.yaml
@@ -0,0 +1,16 @@
+---
+# maven job for 'igmp' repo
+
+- project:
+ name: igmp
+ project: '{name}'
+
+ jobs:
+ - 'igmp-gerrit':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'igmp-gerrit'
+ jobs:
+ - 'verify-licensed'
+ - 'maven-install'
diff --git a/jjb/maven/igmpproxy.yaml b/jjb/maven/igmpproxy.yaml
new file mode 100644
index 0000000..855c809
--- /dev/null
+++ b/jjb/maven/igmpproxy.yaml
@@ -0,0 +1,16 @@
+---
+# maven job for 'igmpproxy' repo
+
+- project:
+ name: igmpproxy
+ project: '{name}'
+
+ jobs:
+ - 'igmpproxy-gerrit':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'igmpproxy-gerrit'
+ jobs:
+ - 'verify-licensed'
+ - 'maven-install'
diff --git a/jjb/maven/mcast.yaml b/jjb/maven/mcast.yaml
new file mode 100644
index 0000000..4ed1433
--- /dev/null
+++ b/jjb/maven/mcast.yaml
@@ -0,0 +1,16 @@
+---
+# maven job for 'mcast' repo
+
+- project:
+ name: mcast
+ project: '{name}'
+
+ jobs:
+ - 'mcast-gerrit':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'mcast-gerrit'
+ jobs:
+ - 'verify-licensed'
+ - 'maven-install'
diff --git a/jjb/maven/olt.yaml b/jjb/maven/olt.yaml
new file mode 100644
index 0000000..a84c9bc
--- /dev/null
+++ b/jjb/maven/olt.yaml
@@ -0,0 +1,16 @@
+---
+# maven job for 'olt' repo
+
+- project:
+ name: olt
+ project: '{name}'
+
+ jobs:
+ - 'olt-gerrit':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'olt-gerrit'
+ jobs:
+ - 'verify-licensed'
+ - 'maven-install'
diff --git a/jjb/maven/sadis.yaml b/jjb/maven/sadis.yaml
new file mode 100644
index 0000000..9b4dff4
--- /dev/null
+++ b/jjb/maven/sadis.yaml
@@ -0,0 +1,16 @@
+---
+# maven job for 'sadis' repo
+
+- project:
+ name: sadis
+ project: '{name}'
+
+ jobs:
+ - 'sadis-gerrit':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'sadis-gerrit'
+ jobs:
+ - 'verify-licensed'
+ - 'maven-install'
diff --git a/jjb/maven/vtn.yaml b/jjb/maven/vtn.yaml
new file mode 100644
index 0000000..3efdd96
--- /dev/null
+++ b/jjb/maven/vtn.yaml
@@ -0,0 +1,16 @@
+---
+# maven job for 'vtn' repo
+
+- project:
+ name: vtn-onos
+ project: '{name}'
+
+ jobs:
+ - 'vtn-gerrit':
+ branch-regexp: '{supported-branches-regexp}'
+
+- job-group:
+ name: 'vtn-gerrit'
+ jobs:
+ - 'verify-licensed'
+ - 'maven-install'