diff options
| -rw-r--r-- | jjb/dcae/dcae-controller-analytics.yaml | 10 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 1 | ||||
| -rw-r--r-- | jjb/policy/policy-common.yaml | 4 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 2 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 4 | ||||
| -rw-r--r-- | jjb/policy/policy-engine.yaml | 4 | ||||
| -rw-r--r-- | jjb/vid/vid.yaml | 2 |
7 files changed, 13 insertions, 14 deletions
diff --git a/jjb/dcae/dcae-controller-analytics.yaml b/jjb/dcae/dcae-controller-analytics.yaml index be54386d6..8b20f01f8 100644 --- a/jjb/dcae/dcae-controller-analytics.yaml +++ b/jjb/dcae/dcae-controller-analytics.yaml @@ -2,10 +2,14 @@ - project: name: dcae-controller-analytics project-name: 'dcae-controller-analytics' + subproject: + - 'utils': + pom: 'dcae-analytics-cdap-common-model/pom.xml' + pattern: 'dcae-analytics-cdap-common-model/**' jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-java-daily' project: 'dcae/controller/analytics' stream: diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 3c50fdace..e99e43164 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -355,6 +355,7 @@ - maven-target: maven-version: 'mvn33' + pom: '{pom}' goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org' properties: - '{maven-deploy-properties}' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 2021f9c3f..4ac1ea3cf 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -5,15 +5,13 @@ jobs: - '{project-name}-{stream}-verify-java-skip-tests' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' project: 'policy/common' stream: - 'master': branch: 'master' mvn-settings: 'policy-common-settings' - maven-deploy-properties: | - deployAtEnd=true files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 4af3bf217..b43cbeb8e 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' project: 'policy/drools-applications' stream: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index fe204b870..406ef00fd 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -5,14 +5,12 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' project: 'policy/drools-pdp' stream: - 'master': branch: 'master' mvn-settings: 'policy-drools-pdp-settings' - maven-deploy-properties: | - deployAtEnd=true files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 5af1d9c43..08ec74aa8 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -5,14 +5,12 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-release-version-java-daily' project: 'policy/engine' stream: - 'master': branch: 'master' mvn-settings: 'policy-engine-settings' - maven-deploy-properties: | - deployAtEnd=true files: '**' archive-artifacts: '' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index c0936fac6..467cc3a5e 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-docker-java-daily': docker-pom: 'pom.xml' - mvn-profile: 'default' + mvn-profile: 'docker' project: 'vid' stream: |