From: Andrew Grimberg Date: Wed, 9 Sep 2015 14:19:54 +0000 (+0000) Subject: Merge "Add Maven site jobs for autorelease" X-Git-Tag: release/beryllium~556 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2d9cd7e2b91eb85a9af98146992b9911ebf299b5;hp=17b737107580536ad9083dbd992b875bc15f8cba;p=releng%2Fbuilder.git Merge "Add Maven site jobs for autorelease" --- diff --git a/jjb-templates/clm.yaml b/jjb-templates/clm.yaml index 6c92aa34e..6ad3da0c7 100644 --- a/jjb-templates/clm.yaml +++ b/jjb-templates/clm.yaml @@ -1,5 +1,5 @@ - job-template: - name: 'PROJECT-clm-{stream}' + name: 'PROJECT_SHORTNAME-clm-{stream}' project-type: maven node: dynamic_verify @@ -32,6 +32,9 @@ prebuilders: - wipe-org-opendaylight-repo + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' @@ -43,8 +46,8 @@ postbuilders: - check-clm: - application-name: PROJECT + application-name: PROJECT_SHORTNAME publishers: - email-notification: - email-prefix: '[PROJECT]' + email-prefix: '[PROJECT_SHORTNAME]' diff --git a/jjb-templates/daily.yaml b/jjb-templates/daily.yaml index df0f0af96..39a23f265 100644 --- a/jjb-templates/daily.yaml +++ b/jjb-templates/daily.yaml @@ -1,5 +1,5 @@ - job-template: - name: 'PROJECT-daily-{stream}' + name: 'PROJECT_SHORTNAME-daily-{stream}' # Job template for daily builders # @@ -42,6 +42,9 @@ prebuilders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' @@ -56,5 +59,5 @@ publishers: - email-notification: - email-prefix: '[PROJECT]' + email-prefix: '[PROJECT_SHORTNAME]' - jacoco-report diff --git a/jjb-templates/distribution.yaml b/jjb-templates/distribution.yaml index fb2ed0517..0ee102c71 100644 --- a/jjb-templates/distribution.yaml +++ b/jjb-templates/distribution.yaml @@ -1,5 +1,5 @@ - job-template: - name: 'PROJECT-distribution-{stream}' + name: 'PROJECT_SHORTNAME-distribution-{stream}' # Required variables: # stream: release stream (eg. stable-lithium or beryllium) @@ -38,6 +38,9 @@ prebuilders: - wipe-org-opendaylight-repo + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' diff --git a/jjb-templates/integration.yaml b/jjb-templates/integration.yaml index 7e7c1ab9a..acd4dbf66 100644 --- a/jjb-templates/integration.yaml +++ b/jjb-templates/integration.yaml @@ -1,5 +1,5 @@ - job-template: - name: 'PROJECT-integration-{stream}' + name: 'PROJECT_SHORTNAME-integration-{stream}' disabled: DISABLED # Job template for ODL integration verify jobs @@ -46,6 +46,9 @@ prebuilders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml index 2061221d2..39dc2d68d 100644 --- a/jjb-templates/merge.yaml +++ b/jjb-templates/merge.yaml @@ -1,5 +1,5 @@ - job-template: - name: 'PROJECT-merge-{stream}' + name: 'PROJECT_SHORTNAME-merge-{stream}' # Job template for ODL merge jobs # @@ -38,12 +38,15 @@ triggers: - gerrit-trigger-patch-merged: - name: 'PROJECT' + name: 'PROJECT_PATH' branch: '{branch}' prebuilders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' @@ -59,7 +62,7 @@ publishers: ARCHIVE_ARTIFACTS - email-notification: - email-prefix: '[PROJECT]' + email-prefix: '[PROJECT_SHORTNAME]' - maven-deploy: id: '' unique-version: true diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml index 0cb05d8b1..ebb7d9d0a 100644 --- a/jjb-templates/project.yaml +++ b/jjb-templates/project.yaml @@ -4,16 +4,17 @@ # ODL Releng build templates - project: - name: PROJECT + name: PROJECT_SHORTNAME jobs: JOB_TEMPLATES # stream: release stream (eg. stable-lithium or beryllium) # branch: git branch (eg. stable/lithium or master) STREAMS - project: 'PROJECT' + project: 'PROJECT_PATH' # For the Job templates below replace instances of: -# PROJECT with your project name (eg. controller) +# PROJECT_SHORTNAME with your project name (eg. circuitsw) +# PROJECT_PATH with your project name (eg. ofextensions/circuitsw) # MAVEN_GOALS with your maven goals to build # MAVEN_OPTS with your maven options to build diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml index d2faa2655..b1cdd64f3 100644 --- a/jjb-templates/sonar.yaml +++ b/jjb-templates/sonar.yaml @@ -1,5 +1,5 @@ - job-template: - name: 'PROJECT-sonar' + name: 'PROJECT_SHORTNAME-sonar' project-type: maven node: dynamic_verify @@ -30,11 +30,14 @@ triggers: - timed: 'H H * * *' - gerrit-trigger-patch-sonar: - name: 'PROJECT' + name: 'PROJECT_PATH' prebuilders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' maven: maven-name: '{mvn33}' @@ -52,5 +55,5 @@ language: 'java' maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m' - email-notification: - email-prefix: '[PROJECT]' + email-prefix: '[PROJECT_SHORTNAME]' - jacoco-report diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml index 0c551d9e9..33dc8886f 100644 --- a/jjb-templates/verify.yaml +++ b/jjb-templates/verify.yaml @@ -1,5 +1,5 @@ - job-template: - name: 'PROJECT-verify-{stream}' + name: 'PROJECT_SHORTNAME-verify-{stream}' # Job template for ODL verify jobs # @@ -49,12 +49,15 @@ triggers: - gerrit-trigger-patch-submitted: - name: 'PROJECT' + name: 'PROJECT_PATH' branch: '{branch}' builders: - wipe-org-opendaylight-repo - jacoco-nojava-workaround + - provide-maven-settings: + global-settings-file: '{odl-global-settings}' + settings-file: '{yangtools-settings}' - maven-target: maven-version: '{mvn33}' pom: 'POM' @@ -67,5 +70,5 @@ publishers: - findbugs - email-notification: - email-prefix: '[PROJECT]' + email-prefix: '[PROJECT_SHORTNAME]' - jacoco-report diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py index f9273c88a..dfb20299e 100644 --- a/scripts/jjb-init-project.py +++ b/scripts/jjb-init-project.py @@ -191,7 +191,8 @@ with open(project_file, "w") as outfile: for line in infile: if not re.match("\s*#", line): line = re.sub("JOB_TEMPLATES", job_templates_yaml, line) - line = re.sub("PROJECT", project.project, line) + line = re.sub("PROJECT_SHORTNAME", project.project, line) + line = re.sub("PROJECT_PATH", project.path, line) line = re.sub("JENKINS_SETTINGS", jenkins_settings, line) line = re.sub("DISABLED", disabled, line) line = re.sub("STREAMS", str_streams, line) diff --git a/scripts/jjblib.py b/scripts/jjblib.py index 51cf9c046..254246fe2 100644 --- a/scripts/jjblib.py +++ b/scripts/jjblib.py @@ -78,7 +78,16 @@ def create_template_config(project_dir, args): class Project: + """Represents a Gerrit Project + + Attributes: + path(str): The full Gerrit path to a project + meta_project(str): The top-level project name in Gerrit + project(str): The subproject name or project shortname + """ + def __init__(self, project): + self.path = project self.meta_project = None self.project = project