diff options
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml | 33 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-cli.yaml | 56 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml | 40 |
3 files changed, 20 insertions, 109 deletions
diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml deleted file mode 100644 index 22a68a2a0..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: dcaegen2-platform-cli-bp-gen - project: 'dcaegen2/platform/cli' - project-name: 'dcaegen2-platform-cli' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - version-properties-file: 'blueprint-generator/version.properties' - mvn-pom: 'blueprint-generator/pom.xml' - mvn-params: '-f blueprint-generator/pom.xml' - pattern: 'blueprint-generator/**' - subproject: - - 'blueprint-gen': - pom: 'blueprint-generator/pom.xml' - pattern: 'blueprint-generator/**' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'dcaegen2-platform-cli-settings' - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml deleted file mode 100644 index 613ef12d3..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -- project: - name: dcaegen2-platform-cli - project-name: 'dcaegen2-platform-cli' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'dcaegen2/platform/cli' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'dcaegen2-platform-cli-settings' - # due to a strange macro / variable translation problem this needs - # to be passed as a string block to properly get the properties - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' - -- project: - name: dcaegen2-platform-cli-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'dcaegen2/platform/cli' - project-name: 'dcaegen2-platform-cli' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cli-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-platform-cli-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform/cli - build-node: ubuntu1604-docker-8c-8g - project-name: 'dcaegen2-platform-cli' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cli-settings' - -- project: - name: dcaegen2-platform-cli-info - project-name: dcaegen2-platform-cli - jobs: - - gerrit-info-yaml-verify - project: dcaegen2/platform/cli - branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 44f8155b0..81c70d15f 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -20,28 +20,28 @@ archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' -#- project: -# name: dcaegen2-services-datalake-handler-release -# project: 'dcaegen2/services' -# project-name: 'dcaegen2-services-datalake-handler' -# jobs: -# - gerrit-maven-stage: -# sign-artifacts: true -# build-node: centos7-builder-4c-4g -# maven-versions-plugin: true -# mvn-pom: 'components/datalake-handler/pom.xml' -# mvn-params: '-f components/datalake-handler/pom.xml' -# version-properties-file: 'components/datalake-handler/version.properties' -# pattern: 'components/datalake-handler/**' -# - gerrit-maven-docker-stage: -# build-node: ubuntu1604-docker-8c-8g -# mvn-goals: 'clean package docker:build -DpushImage -f components/datalake-handler/pom.xml' -# container-public-registry: 'nexus3.onap.org:10001' -# container-staging-registry: 'nexus3.onap.org:10003' -# pattern: 'components/datalake-handler/**' +- project: + name: dcaegen2-services-datalake-handler-release + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler' + jobs: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + mvn-pom: 'components/datalake-handler/pom.xml' + mvn-params: '-f components/datalake-handler/pom.xml' + version-properties-file: 'components/datalake-handler/version.properties' + pattern: 'components/datalake-handler/**' + - gerrit-maven-docker-stage: + build-node: ubuntu1604-docker-8c-8g + mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/pom.xml' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + pattern: 'components/datalake-handler/**' stream: - 'master': - branch: 'master' + branch: 'master' mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | deployAtEnd=true |