diff options
| -rw-r--r-- | jjb/global-templates-java.yaml | 80 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-framework-java.yaml | 1 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack-vmware-java.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-sfc.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 6 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-resmanagement.yaml | 5 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-wfengine-java.yaml | 2 |
8 files changed, 93 insertions, 7 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 95e2ecc94..9cbae2ed2 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -902,6 +902,86 @@ # pom: name/location of the pom.xml file relative to the workspace + name: '{project-name}-{stream}-{subproject}-release-version-java-daily' + + project-type: freestyle + node: '{build-node}' + maven-deploy-properties: + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - maven-exec: + maven-version: '{maven-version}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + # 11 AM UTC + - timed: 'H 11 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - inject: + properties-file: version.properties + - maven-target: + maven-version: '{maven-version}' + goals: 'versions:set versions:update-child-modules versions:commit -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + properties: + - '{maven-deploy-properties}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: + # Job template for Java daily release jobs with POM not at the root + # + # The purpose of this job template is to run "maven version && maven clean + # deploy" for projects using this template. + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + # pom: name/location of the pom.xml file relative to the workspace + + name: '{project-name}-{stream}-{subproject}-release-java-daily-no-sonar' project-type: freestyle diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 6535e8420..9f140ced5 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -14,6 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index e2c4ec889..dd3026a5b 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -17,7 +17,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 9fef201ac..1a05a1009 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -14,7 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-{subproject}-release-version3-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index db40e10c8..a7406c6ab 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -9,12 +9,12 @@ mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' subproject: - 'drv-vnfm-huawei': - pom: 'huawei/vnfmadapter/pom.xml' - pattern: 'huawei/vnfmadapter/**' + pom: 'huawei/pom.xml' + pattern: 'huawei/**' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-{subproject}-release-version3-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml index 62a06ae31..0613b38ce 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml @@ -14,7 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-{subproject}-release-version3-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 2dc778d16..0d2437328 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -9,10 +9,15 @@ - 'master': branch: 'master' build-node: ubuntu1604-basebuild-4c-4g + subproject: + - 'deployment': + pom: 'ResmanagementService/deployment/pom.xml' + pattern: 'ResmanagementService/deployment/**' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-{subproject}-release-version3-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 399d934dc..8759a56d0 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -18,7 +18,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' |