diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/aai/aai-aai-service.yaml | 7 | ||||
| -rw-r--r-- | jjb/ccsdk/sli-northbound.yaml | 1 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 2 | ||||
| -rw-r--r-- | jjb/portal/portal-sdk.yaml | 4 | ||||
| -rw-r--r-- | jjb/so/so.yaml | 2 | ||||
| -rw-r--r-- | jjb/vid/vid.yaml | 2 | ||||
| -rw-r--r-- | jjb/vvp/vvp-gitlab.yaml | 1 | ||||
| -rw-r--r-- | jjb/vvp/vvp-image-scanner.yaml | 1 | ||||
| -rw-r--r-- | jjb/vvp/vvp-jenkins.yaml | 1 | ||||
| -rw-r--r-- | jjb/vvp/vvp-portal.yaml | 1 | ||||
| -rw-r--r-- | jjb/vvp/vvp-postgresql.yaml | 1 | ||||
| -rw-r--r-- | jjb/vvp/vvp-test-engine.yaml | 1 |
12 files changed, 13 insertions, 11 deletions
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml index 4d1eb21ed..52d87e8ba 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -6,13 +6,6 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'ajsc-aai/pom.xml' - mvn-goals: 'docker:build' project: 'aai/aai-service' stream: diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index acc26ab37..2e5531205 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -20,3 +20,4 @@ deployAtEnd=true files: '**' archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 7ddd0707f..713ea2fd9 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1975,6 +1975,7 @@ name: '{project-name}-{stream}-stage-site-java' project-type: freestyle node: '{build-node}' + pom: 'pom.xml' properties: - infra-properties: @@ -2011,6 +2012,7 @@ properties-file: version.properties - maven-target: maven-version: '{maven-version}' + pom: '{pom}' goals: 'versions:set versions:update-child-modules versions:commit -B' properties: - 'newVersion=${{release_version}}' diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal/portal-sdk.yaml index dc79848d6..63304419d 100644 --- a/jjb/portal/portal-sdk.yaml +++ b/jjb/portal/portal-sdk.yaml @@ -6,14 +6,16 @@ - 'ecomp-sdk': pom: 'ecomp-sdk/pom.xml' pattern: 'ecomp-sdk/**' + subproject-name: 'ecomp-sdk' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-java-daily' - '{project-name}-{stream}-stage-site-java': + pom: 'ecomp-sdk/pom.xml' site-pom: 'ecomp-sdk/pom.xml' - trigger-job: '{project-name}-{stream}-{subproject}-release-java-daily' + trigger-job: '{project-name}-{stream}-{subproject-name}-release-java-daily' project: 'portal/sdk' stream: diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index e28bd2889..7278f0f7f 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -14,7 +14,7 @@ archive-artifacts: 'packages/arquillian-unit-tests/target/**/*' - '{project-name}-{stream}-release-version-profile-java-daily': mvn-profile: 'with-integration-tests' - build-node: 'ubuntu1604-basebuild-8c-8g' + build-node: 'ubuntu1604-docker-8c-8g' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 2a2ce3ed0..33a7f2851 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -19,8 +19,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' diff --git a/jjb/vvp/vvp-gitlab.yaml b/jjb/vvp/vvp-gitlab.yaml index dd38f8536..8a307a9ef 100644 --- a/jjb/vvp/vvp-gitlab.yaml +++ b/jjb/vvp/vvp-gitlab.yaml @@ -15,5 +15,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml index 68365c2fe..a9697c784 100644 --- a/jjb/vvp/vvp-image-scanner.yaml +++ b/jjb/vvp/vvp-image-scanner.yaml @@ -15,5 +15,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' diff --git a/jjb/vvp/vvp-jenkins.yaml b/jjb/vvp/vvp-jenkins.yaml index 007e1ca19..fefc29ce2 100644 --- a/jjb/vvp/vvp-jenkins.yaml +++ b/jjb/vvp/vvp-jenkins.yaml @@ -15,5 +15,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' diff --git a/jjb/vvp/vvp-portal.yaml b/jjb/vvp/vvp-portal.yaml index a34826952..856b489e0 100644 --- a/jjb/vvp/vvp-portal.yaml +++ b/jjb/vvp/vvp-portal.yaml @@ -15,5 +15,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' diff --git a/jjb/vvp/vvp-postgresql.yaml b/jjb/vvp/vvp-postgresql.yaml index 749e9ed6c..c137ffbe3 100644 --- a/jjb/vvp/vvp-postgresql.yaml +++ b/jjb/vvp/vvp-postgresql.yaml @@ -15,5 +15,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml index f187349ab..de5857ba7 100644 --- a/jjb/vvp/vvp-test-engine.yaml +++ b/jjb/vvp/vvp-test-engine.yaml @@ -15,5 +15,6 @@ build-node: ubuntu1604-basebuild-4c-4g jobs: - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' |