Revise Maven-based tests/builds
- Rename jobs to match current naming scheme
- Allow jobs to be renamed so they can be used with both JDK 8 and 11
- Run tests and publish junit/cobertura if found
- Move repo jobs into the verify dir from the maven dir to match others
- Update tagcollision/versiontag to parse versions from pom.xml files
Change-Id: I5e9da20bbdcb0edc62bb35e171aa4e13f91c2ab1
diff --git a/jjb/cord-onos-app-publishing.yaml b/jjb/cord-onos-app-publishing.yaml
deleted file mode 100644
index 4ba0f40..0000000
--- a/jjb/cord-onos-app-publishing.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
----
-# onos-app-publishing
-
-- project:
- name: onos-app-publishing
-
- project-name: '{name}'
-
- jobs:
- - 'onos-app-publishing'
-
-
-- job-template:
- id: onos-app-publishing
- name: 'cord-onos-app-publishing'
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Created by {id} job-template from ci-management/jjb/cord-onos-app-publishing.yaml
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
- parameters:
- - string:
- name: notificationEmail
- default: 'teo@opennetworking.org, saurav.das@opennetworking.org'
- description: ''
-
- - string:
- name: jdkDistro
- default: '{jdk-distribution}'
- description: 'Distribution of the JDK to use with update-java-alternatives'
-
- node: 'ubuntu16.04-basebuild-1c-2g'
- project-type: pipeline
- concurrent: true
-
- pipeline-scm:
- script-path: 'Jenkinsfile'
- scm:
- - git:
- url: '{gerrit-server-url}/cord-onos-publisher'
- branches:
- - 'master'
-
- triggers:
- - timed: |
- TZ=America/Los_Angeles
- H 0 * * *
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 69b39fb..ccc679b 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -86,7 +86,7 @@
# matching repos that should be version tagged by the version-tag job
# (basically the same as imagebuilder projects + helm charts + tools
- version-tag-projects-regexp: '^(xos.*|.*helm-charts|automation-tools|cord-tester|chameleon|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|kubernetes-service|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver|tt-workflow-driver|ves-agent|voltha-bbsim|openolt|sadis-server|kafka-topic-exporter|pyvoltha|voltha-adtran-adapter|voltha-openolt-adapter|voltha-openonu-adapter|plyxproto|voltha-protos|alpine-grpc-base|cordctl|voltha-go|voltha-onos|device-management|cord-workflow.*|voltha-system-tests|openairinterface|omec-.*|bbsim|omci-sim|ponsim|pppoel2relay|voltha-api-server)$'
+ version-tag-projects-regexp: '^(xos.*|.*helm-charts|automation-tools|cord-tester|chameleon|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|kubernetes-service|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver|tt-workflow-driver|ves-agent|voltha-bbsim|openolt|sadis-server|kafka-topic-exporter|pyvoltha|voltha-adtran-adapter|voltha-openolt-adapter|voltha-openonu-adapter|plyxproto|voltha-protos|alpine-grpc-base|cordctl|voltha-go|voltha-onos|device-management|cord-workflow.*|voltha-system-tests|openairinterface|omec-.*|bbsim|omci-sim|ponsim|pppoel2relay|voltha-api-server|aaa|config|dhcpl2relay|igmp|igmpproxy|kafka-onos|mcast|olt|sadis|vtn)$'
# PyPI related publishing variables
#
diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index 5287127..cc2bc62 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -2,8 +2,8 @@
# maven jobs for Java projects
- job-template:
- id: maven-install
- name: '{project}-gerrit'
+ id: maven-test
+ name: 'verify_{project}_maven-test{name-extension}'
description: |
<!-- Managed by Jenkins Job Builder -->
Created by {id} job-template from ci-management/jjb/maven.yaml
@@ -13,16 +13,6 @@
parameters:
- string:
- name: GERRIT_BRANCH
- default: 'master'
- description: 'Use default when using "Build Now"'
-
- - string:
- name: GERRIT_REFSPEC
- default: 'refs/heads/master'
- description: 'Use default when using "Build Now"'
-
- - string:
name: jdkDistro
default: '{jdk-distribution}'
description: 'Distribution of the JDK to use with update-java-alternatives'
@@ -41,24 +31,16 @@
artifact-num-to-keep: '{artifact-num-to-keep}'
scm:
- - git:
- url: '{gerrit-server-url}/{project}'
- branches:
- - '$GERRIT_BRANCH'
+ - lf-infra-gerrit-scm:
+ git-url: '$GIT_URL/$GERRIT_PROJECT'
refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- shallow-clone: true
+ branch: '$GERRIT_BRANCH'
+ submodule-recursive: 'false'
+ choosing-strategy: gerrit
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
builders:
- # NOTE: this env var is only required to fix a bug in the "surefire" dependency:
- # https://issues.apache.org/jira/browse/SUREFIRE-1588
- # https://github.com/apache/maven-surefire/pull/197
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
- # should be removed as soon as this problem is resolved
- - inject:
- properties-content: |
- _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
-
+ # Set JDK version
- shell: |
#!/usr/bin/env bash
set -eu -o pipefail
@@ -67,13 +49,32 @@
echo "Java Version:"
java -version
+ # run tests and install
- maven-target:
pom: pom.xml
- goals: 'clean install'
+ settings: onoscord-apps
+ settings-type: cfp
+ goals: 'clean test install'
+
+ publishers:
+ - junit:
+ results: "**/TEST-*.xml"
+ allow-empty-results: '{junit-allow-empty-results}'
+ - cobertura:
+ report-file: "**/*coverage.xml"
+ targets:
+ - files:
+ healthy: 80
+ unhealthy: 0
+ failing: 0
+ - method:
+ healthy: 50
+ unhealthy: 0
+ failing: 0
- job-template:
- id: maven-deploy
- name: '{project}-gerrit-deploy'
+ id: maven-publish
+ name: 'maven-publish{name-extension}_{project}'
description: |
<!-- Managed by Jenkins Job Builder -->
Created by {id} job-template from ci-management/jjb/maven.yaml
@@ -83,16 +84,6 @@
parameters:
- string:
- name: GERRIT_BRANCH
- default: 'master'
- description: 'Use default when using "Build Now"'
-
- - string:
- name: GERRIT_REFSPEC
- default: 'refs/heads/master'
- description: 'Use default when using "Build Now"'
-
- - string:
name: jdkDistro
default: '{jdk-distribution}'
description: 'Distribution of the JDK to use with update-java-alternatives'
@@ -111,19 +102,16 @@
artifact-num-to-keep: '{artifact-num-to-keep}'
scm:
- - git:
- url: '{gerrit-server-url}/{project}'
- branches:
- - '$GERRIT_BRANCH'
+ - lf-infra-gerrit-scm:
+ git-url: '$GIT_URL/$GERRIT_PROJECT'
refspec: '$GERRIT_REFSPEC'
- choosing-strategy: 'gerrit'
- shallow-clone: true
+ branch: '$GERRIT_BRANCH'
+ submodule-recursive: 'false'
+ choosing-strategy: gerrit
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
builders:
- - inject:
- properties-content: |
- _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
-
+ # Set JDK version
- shell: |
#!/usr/bin/env bash
set -eu -o pipefail
@@ -137,70 +125,3 @@
settings: onoscord-apps
settings-type: cfp
goals: 'clean deploy'
-
-- job-template:
- id: maven-test
- name: 'verify_{project}_maven-test'
- description: |
- <!-- Managed by Jenkins Job Builder -->
- Created by {id} job-template from ci-management/jjb/maven.yaml
-
- parameters:
- - string:
- name: jdkDistro
- default: '{jdk-distribution}'
- description: 'Distribution of the JDK to use with update-java-alternatives'
-
- triggers:
- - cord-infra-gerrit-trigger-patchset:
- gerrit-server-name: '{gerrit-server-name}'
- project-regexp: '{project}'
- branch-regexp: '{branch-regexp}'
- file-include-regexp: '{all-files-regexp}'
- dependency-jobs: '{dependency-jobs}'
-
- properties:
- - cord-infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
- artifact-num-to-keep: '{artifact-num-to-keep}'
-
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: 30
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- scm:
- - lf-infra-gerrit-scm:
- git-url: '$GIT_URL/$GERRIT_PROJECT'
- refspec: '$GERRIT_REFSPEC'
- branch: '$GERRIT_BRANCH'
- submodule-recursive: 'false'
- choosing-strategy: gerrit
- jenkins-ssh-credential: '{jenkins-ssh-credential}'
-
- node: 'ubuntu16.04-basebuild-1c-2g'
- project-type: maven
- concurrent: true
-
- builders:
- # NOTE: this env var is only required to fix a bug in the "surefire" dependency:
- # https://issues.apache.org/jira/browse/SUREFIRE-1588
- # https://github.com/apache/maven-surefire/pull/197
- # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=911925
- # should be removed as soon as this problem is resolved
- - inject:
- properties-content: |
- _JAVA_OPTIONS=-Djdk.net.URLClassPath.disableClassPathURLCheck=true
-
- - shell: |
- #!/usr/bin/env bash
- set -eu -o pipefail
- echo "Setting JDK Distro to: $jdkDistro"
- sudo update-java-alternatives -s $jdkDistro
- echo "Java Version:"
- java -version
-
- - maven-target:
- pom: pom.xml
- goals: 'test'
diff --git a/jjb/maven/aaa.yaml b/jjb/maven/aaa.yaml
deleted file mode 100644
index e11b20b..0000000
--- a/jjb/maven/aaa.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'aaa' repo
-
-- project:
- name: aaa
- project: '{name}'
-
- jobs:
- - 'aaa-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'aaa-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/maven/config.yaml b/jjb/maven/config.yaml
deleted file mode 100644
index 8c4669b..0000000
--- a/jjb/maven/config.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'config' repo
-
-- project:
- name: config
- project: '{name}'
-
- jobs:
- - 'config-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'config-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/maven/dhcpl2relay.yaml b/jjb/maven/dhcpl2relay.yaml
deleted file mode 100644
index 1f3ed0a..0000000
--- a/jjb/maven/dhcpl2relay.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'dhcpl2relay' repo
-
-- project:
- name: dhcpl2relay
- project: '{name}'
-
- jobs:
- - 'dhcpl2relay-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'dhcpl2relay-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/maven/igmp.yaml b/jjb/maven/igmp.yaml
deleted file mode 100644
index 4e59cb7..0000000
--- a/jjb/maven/igmp.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'igmp' repo
-
-- project:
- name: igmp
- project: '{name}'
-
- jobs:
- - 'igmp-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'igmp-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/maven/igmpproxy.yaml b/jjb/maven/igmpproxy.yaml
deleted file mode 100644
index 5e88bb2..0000000
--- a/jjb/maven/igmpproxy.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'igmpproxy' repo
-
-- project:
- name: igmpproxy
- project: '{name}'
-
- jobs:
- - 'igmpproxy-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'igmpproxy-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/maven/kafka-onos.yaml b/jjb/maven/kafka-onos.yaml
deleted file mode 100644
index cfc438d..0000000
--- a/jjb/maven/kafka-onos.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'kafka-onos' repo
-
-- project:
- name: kafka-onos
- project: '{name}'
-
- jobs:
- - 'kafka-onos-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'kafka-onos-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/maven/mcast.yaml b/jjb/maven/mcast.yaml
deleted file mode 100644
index 60874bb..0000000
--- a/jjb/maven/mcast.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'mcast' repo
-
-- project:
- name: mcast
- project: '{name}'
-
- jobs:
- - 'mcast-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'mcast-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/maven/olt.yaml b/jjb/maven/olt.yaml
deleted file mode 100644
index 38ae126..0000000
--- a/jjb/maven/olt.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'olt' repo
-
-- project:
- name: olt
- project: '{name}'
-
- jobs:
- - 'olt-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'olt-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/maven/sadis.yaml b/jjb/maven/sadis.yaml
deleted file mode 100644
index 2058847..0000000
--- a/jjb/maven/sadis.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'sadis' repo
-
-- project:
- name: sadis
- project: '{name}'
-
- jobs:
- - 'sadis-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'sadis-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/maven/vtn.yaml b/jjb/maven/vtn.yaml
deleted file mode 100644
index 8afe595..0000000
--- a/jjb/maven/vtn.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# maven job for 'vtn' repo
-
-- project:
- name: vtn
- project: '{name}'
-
- jobs:
- - 'vtn-gerrit':
- branch-regexp: '^(.*)$'
-
-- job-group:
- name: 'vtn-gerrit'
- jobs:
- - 'verify-licensed'
- - 'maven-install'
- - 'maven-deploy'
diff --git a/jjb/shell/tagcollisionreject.sh b/jjb/shell/tagcollisionreject.sh
index 85015d4..49d6e21 100755
--- a/jjb/shell/tagcollisionreject.sh
+++ b/jjb/shell/tagcollisionreject.sh
@@ -41,6 +41,10 @@
then
NEW_VERSION=$(python -c 'import json,sys;obj=json.load(sys.stdin); print obj["version"]' < package.json)
VERSIONFILE="package.json"
+ elif [ -f "pom.xml" ]
+ then
+ NEW_VERSION=$(xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' pom.xml)
+ VERSIONFILE="pom.xml"
else
echo "ERROR: No versioning file found!"
exit 1
diff --git a/jjb/shell/versiontag.sh b/jjb/shell/versiontag.sh
index 669aeec..a75087b 100755
--- a/jjb/shell/versiontag.sh
+++ b/jjb/shell/versiontag.sh
@@ -42,6 +42,10 @@
then
NEW_VERSION=$(python -c 'import json,sys;obj=json.load(sys.stdin); print obj["version"]' < package.json)
VERSIONFILE="package.json"
+ elif [ -f "pom.xml" ]
+ then
+ NEW_VERSION=$(xmllint --xpath '/*[local-name()="project"]/*[local-name()="version"]/text()' pom.xml)
+ VERSIONFILE="pom.xml"
else
echo "ERROR: No versioning file found!"
exit 1
diff --git a/jjb/verify/aaa.yaml b/jjb/verify/aaa.yaml
new file mode 100644
index 0000000..438dd3e
--- /dev/null
+++ b/jjb/verify/aaa.yaml
@@ -0,0 +1,36 @@
+---
+# jobs for 'aaa' repo
+
+- project:
+ name: aaa
+ project: '{name}'
+
+ jobs:
+ - 'aaa-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'aaa-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'aaa-jobs-legacy':
+ branch-regexp: '^(aaa-1.10)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'aaa-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'aaa-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'aaa-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
diff --git a/jjb/verify/config.yaml b/jjb/verify/config.yaml
new file mode 100644
index 0000000..ec9f48f
--- /dev/null
+++ b/jjb/verify/config.yaml
@@ -0,0 +1,37 @@
+---
+# jobs for 'config' repo
+
+- project:
+ name: config
+ project: '{name}'
+
+ jobs:
+ - 'config-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'config-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'config-jobs-legacy':
+ branch-regexp: '^(config-1.5)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'config-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'config-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'config-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
diff --git a/jjb/verify/dhcpl2relay.yaml b/jjb/verify/dhcpl2relay.yaml
new file mode 100644
index 0000000..ef1d849
--- /dev/null
+++ b/jjb/verify/dhcpl2relay.yaml
@@ -0,0 +1,37 @@
+---
+# jobs for 'dhcpl2relay' repo
+
+- project:
+ name: dhcpl2relay
+ project: '{name}'
+
+ jobs:
+ - 'dhcpl2relay-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'dhcpl2relay-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'dhcpl2relay-jobs-legacy':
+ branch-regexp: '^(dhcpl2relay-1.6)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'dhcpl2relay-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'dhcpl2relay-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'dhcpl2relay-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
diff --git a/jjb/verify/igmp.yaml b/jjb/verify/igmp.yaml
new file mode 100644
index 0000000..128d5ab
--- /dev/null
+++ b/jjb/verify/igmp.yaml
@@ -0,0 +1,37 @@
+---
+# jobs for 'igmp' repo
+
+- project:
+ name: igmp
+ project: '{name}'
+
+ jobs:
+ - 'igmp-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'igmp-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'igmp-jobs-legacy':
+ branch-regexp: '^(igmp-1.5)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'igmp-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'igmp-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'igmp-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
diff --git a/jjb/verify/igmpproxy.yaml b/jjb/verify/igmpproxy.yaml
new file mode 100644
index 0000000..8f9c1b4
--- /dev/null
+++ b/jjb/verify/igmpproxy.yaml
@@ -0,0 +1,37 @@
+---
+# jobs for 'igmpproxy' repo
+
+- project:
+ name: igmpproxy
+ project: '{name}'
+
+ jobs:
+ - 'igmpproxy-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'igmpproxy-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'igmpproxy-jobs-legacy':
+ branch-regexp: '^(igmpproxy-1.3)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'igmpproxy-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'igmpproxy-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'igmpproxy-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
diff --git a/jjb/verify/kafka-onos.yaml b/jjb/verify/kafka-onos.yaml
new file mode 100644
index 0000000..e59c307
--- /dev/null
+++ b/jjb/verify/kafka-onos.yaml
@@ -0,0 +1,37 @@
+---
+# jobs for 'kafka-onos' repo
+
+- project:
+ name: kafka-onos
+ project: '{name}'
+
+ jobs:
+ - 'kafka-onos-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'kafka-onos-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'kafka-onos-jobs-legacy':
+ branch-regexp: '^(kafka-onos-1.1)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'kafka-onos-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'kafka-onos-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'kafka-onos-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
diff --git a/jjb/verify/mcast.yaml b/jjb/verify/mcast.yaml
new file mode 100644
index 0000000..e8f478c
--- /dev/null
+++ b/jjb/verify/mcast.yaml
@@ -0,0 +1,37 @@
+---
+# jobs for 'mcast' repo
+
+- project:
+ name: mcast
+ project: '{name}'
+
+ jobs:
+ - 'mcast-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'mcast-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'mcast-jobs-legacy':
+ branch-regexp: '^(mcast-1.5)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'mcast-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'mcast-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'mcast-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
diff --git a/jjb/verify/olt.yaml b/jjb/verify/olt.yaml
new file mode 100644
index 0000000..a26f31b
--- /dev/null
+++ b/jjb/verify/olt.yaml
@@ -0,0 +1,37 @@
+---
+# jobs for 'olt' repo
+
+- project:
+ name: olt
+ project: '{name}'
+
+ jobs:
+ - 'olt-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'olt-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'olt-jobs-legacy':
+ branch-regexp: '^(olt-2.2)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'olt-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'olt-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'olt-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
diff --git a/jjb/maven/pppoel2relay.yaml b/jjb/verify/pppoel2relay.yaml
similarity index 63%
rename from jjb/maven/pppoel2relay.yaml
rename to jjb/verify/pppoel2relay.yaml
index 0932cc3..51be4d4 100644
--- a/jjb/maven/pppoel2relay.yaml
+++ b/jjb/verify/pppoel2relay.yaml
@@ -1,18 +1,18 @@
---
-# maven job for 'pppoel2relay' repo
+# jobs for 'pppoel2relay' repo
- project:
name: pppoel2relay
project: '{name}'
jobs:
- - 'pppoel2relay-gerrit':
+ - 'pppoel2relay-jobs':
branch-regexp: '^(.*)$'
- job-group:
- name: 'pppoel2relay-gerrit'
+ name: 'pppoel2relay-jobs'
jobs:
- 'verify-licensed'
- 'tag-collision-reject'
- 'maven-install'
- - 'maven-deploy'
+ - 'maven-publish'
diff --git a/jjb/verify/sadis.yaml b/jjb/verify/sadis.yaml
new file mode 100644
index 0000000..fe700d0
--- /dev/null
+++ b/jjb/verify/sadis.yaml
@@ -0,0 +1,37 @@
+---
+# jobs for 'sadis' repo
+
+- project:
+ name: sadis
+ project: '{name}'
+
+ jobs:
+ - 'sadis-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'sadis-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'sadis-jobs-legacy':
+ branch-regexp: '^(sadis-3.1)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'sadis-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'sadis-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'sadis-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
diff --git a/jjb/verify/vtn.yaml b/jjb/verify/vtn.yaml
new file mode 100644
index 0000000..1dbed6d
--- /dev/null
+++ b/jjb/verify/vtn.yaml
@@ -0,0 +1,37 @@
+---
+# jobs for 'vtn' repo
+
+- project:
+ name: vtn
+ project: '{name}'
+
+ jobs:
+ - 'vtn-jobs-common':
+ branch-regexp: '^(.*)$'
+
+ - 'vtn-jobs':
+ branch-regexp: '^(master)$'
+
+ - 'vtn-jobs-legacy':
+ branch-regexp: '^(vtn-1.7)$'
+ jdk-distribution: 'java-1.8.0-amazon-corretto'
+ name-extension: '-jdk8'
+
+- job-group:
+ name: 'vtn-jobs-common'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject'
+
+- job-group:
+ name: 'vtn-jobs'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+
+- job-group:
+ name: 'vtn-jobs-legacy'
+ jobs:
+ - 'maven-test'
+ - 'maven-publish'
+