diff options
50 files changed, 191 insertions, 607 deletions
diff --git a/.gitignore b/.gitignore index e824ce3fc..11b529f4a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,5 @@ target/ .tox/ __pycache__/ *.pyc + +onap_sandbox diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml index 35d9fe876..d3e75b478 100644 --- a/jjb/aaf/aaf-authz-docker.yaml +++ b/jjb/aaf/aaf-authz-docker.yaml @@ -16,7 +16,7 @@ - skipDockerTag=true - skipDockerPush=true - '{project-name}-{stream}-docker-java-properties-daily': - docker-pom: 'pom.xml' + docker-pom: 'authz-service/pom.xml' mvn-profile: 'docker' maven-properties: | skip.docker.build=false diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index a1dd7a479..f2c7860c5 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -7,10 +7,13 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily' + - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': - site-pom: 'aaf/authz/pom.xml' + site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' + - '{project-name}-{stream}-docker-version-java-daily': + mvn-goals: 'docker:build' project: 'aaf/authz' stream: - 'master': @@ -18,5 +21,7 @@ - 'release-1.0.0': branch: 'release-1.0.0' mvn-settings: 'aaf-authz-settings' + mvn-profile: docker + docker-pom: 'authz-service/pom.xml' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/dcae/apod-analytics.yaml b/jjb/dcae/apod-analytics.yaml deleted file mode 100644 index 234bd2dde..000000000 --- a/jjb/dcae/apod-analytics.yaml +++ /dev/null @@ -1,47 +0,0 @@ ---- - -- project: - name: dcae-apod-anlytics - - # job template iterators - project-name: 'dcae-apod-analytics' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - - # apply to all jobs - project: 'dcae/apod/analytics' - mvn-settings: 'dcae-apod-analytics-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g - extra-project: 'dcae/apod/buildtools' - extra-branch: '{branch}' - extra-refspec: 'refs/heads/{branch}' - checkout-dir: 'dcae-apod-buildtools' - - jobs: - - '{project-name}-{stream}-daily-release-2scm-mvn-script': - mvn-goals-versioning: - 'versions:set versions:update-child-modules versions:commit' - mvn-goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}' - maven-deploy-properties: | - deployAtEnd=true - script: | - /bin/bash \ - './dcae-apod-buildtools/scripts/script-apod-analytics-daily-release.sh' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-daily-release-2scm-mvn-script' - - '{project-name}-{stream}-verify-2scm-mvn-script': - mvn-goals: 'clean install' - script: | - /bin/bash \ - './dcae-apod-buildtools/scripts/script-apod-analytics-verify.sh' - - '{project-name}-{stream}-merge-2scm-mvn-script': - mvn-goals: 'clean deploy' - script: | - /bin/bash \ - './dcae-apod-buildtools/scripts/script-apod-analytics-merge.sh' diff --git a/jjb/dcae/apod-buildtools.yaml b/jjb/dcae/apod-buildtools.yaml deleted file mode 100644 index ac3f69f8a..000000000 --- a/jjb/dcae/apod-buildtools.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- - -- project: - name: dcae-apod-buildtools - project-name: 'dcae-apod-buildtools' - - project: 'dcae/apod/buildtools' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - - mvn-settings: 'dcae-apod-buildtools-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g - mvn-goals: '--version' - mvn-goals-versioning: '--version' - jobs: - - '{project-name}-{stream}-verify-scm-mvn-script': - script: 'ls -lR' diff --git a/jjb/dcae/apod-cdap.yaml b/jjb/dcae/apod-cdap.yaml deleted file mode 100644 index 6b3619a56..000000000 --- a/jjb/dcae/apod-cdap.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- - -- project: - name: dcae-apod-cdap - project-name: 'dcae-apod-cdap' - - project: 'dcae/apod/cdap' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - - mvn-settings: 'dcae-apod-cdap-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g - mvn-goals: '--version' - mvn-goals-versioning: '--version' - extra-project: 'dcae/apod/buildtools' - extra-branch: '{branch}' - extra-refspec: 'refs/heads/{branch}' - checkout-dir: 'dcae-apod-buildtools' - jobs: - - '{project-name}-{stream}-daily-release-2scm-mvn-script': - script: | - /bin/bash \ - ./dcae-apod-buildtools/scripts/script-apod-cdap-daily-release.sh - - '{project-name}-{stream}-verify-2scm-mvn-script': - script: | - /bin/bash ./dcae-apod-buildtools/scripts/script-apod-cdap-verify.sh - - '{project-name}-{stream}-merge-2scm-mvn-script': - script: | - /bin/bash ./dcae-apod-buildtools/scripts/script-apod-cdap-merge.sh diff --git a/jjb/dcae/collectors-ves.yaml b/jjb/dcae/collectors-ves.yaml deleted file mode 100644 index 8351cf281..000000000 --- a/jjb/dcae/collectors-ves.yaml +++ /dev/null @@ -1,50 +0,0 @@ ---- - -- project: - name: dcae-collectors-ves - - # job template iterators - project-name: 'dcae-collectors-ves' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - - # apply to all jobs - project: 'dcae/collectors/ves' - mvn-settings: 'dcae-collectors-ves-settings' - # default to no op - mvn-goals: '--version' - # default to no op - mvn-goals-versioning: '--version' - files: '**' - archive-artifacts: '' - - jobs: - - '{project-name}-{stream}-daily-release-scm-mvn-script': - # job specific - mvn-goals-versioning: - # yamllint disable rule:line-length - 'versions:set versions:update-child-modules versions:commit' - # yamllint enable - mvn-goals: 'clean deploy' - maven-deploy-properties: | - deployAtEnd=true - script: | - bash ./docker-build.sh release - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-daily-release-scm-mvn-script' - - '{project-name}-{stream}-merge-scm-mvn-script': - # job specific - mvn-goals: 'clean deploy' - script: | - bash ./docker-build.sh merge - - '{project-name}-{stream}-verify-scm-mvn-script': - # job specific - mvn-goals: 'clean install' - script: | - bash ./docker-build.sh verify - - '{project-name}-docker-image-blessing' diff --git a/jjb/dcae/dcae-controller-analytics.yaml b/jjb/dcae/dcae-controller-analytics.yaml deleted file mode 100644 index 306122fdf..000000000 --- a/jjb/dcae/dcae-controller-analytics.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- 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}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: - 'dcae-analytics-cdap-common-model/pom.xml' - trigger-job: - '{project-name}-{stream}-{subproject}-release-version2-java-daily' - - project: 'dcae/controller/analytics' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dcae-controller-analytics-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: '' diff --git a/jjb/dcae/dcae-controller.yaml b/jjb/dcae/dcae-controller.yaml deleted file mode 100644 index 43b76c94a..000000000 --- a/jjb/dcae/dcae-controller.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- project: - name: dcae-controller - project-name: 'dcae-controller' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version2-java-daily' - - project: 'dcae/controller' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - - mvn-settings: 'dcae-controller-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: '' diff --git a/jjb/dcae/dcae-demo.yaml b/jjb/dcae/dcae-demo.yaml deleted file mode 100644 index f85e92c33..000000000 --- a/jjb/dcae/dcae-demo.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- - -- project: - name: dcae-demo - project-name: 'dcae-demo' - project: 'dcae/demo' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dcae-demo-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g - mvn-goals-versioning: '--version' - jobs: - - '{project-name}-{stream}-daily-release-version2-scm-mvn-script': - mvn-goals: 'clean install' - maven-deploy-properties: | - deployAtEnd=true - # yamllint disable rule:line-length - script: | - bash dcae-demo-controller/src/main/docker-build/build.sh - bash dcae-demo-controller/src/main/docker-build/push.sh \ - nexus3.onap.org:10003 - # yamllint enable - - '{project-name}-{stream}-merge-scm-mvn-script': - mvn-goals: 'clean deploy' - # yamllint disable rule:line-length - script: | - bash dcae-demo-controller/src/main/docker-build/build.sh - bash dcae-demo-controller/src/main/docker-build/push.sh \ - nexus3.onap.org:10003 - # yamllint enable - - '{project-name}-{stream}-verify-scm-mvn-script': - mvn-goals: 'clean install' - script: | - bash dcae-demo-controller/src/main/docker-build/build.sh diff --git a/jjb/dcae/dcae-operation-utils.yaml b/jjb/dcae/dcae-operation-utils.yaml deleted file mode 100644 index ea91ef885..000000000 --- a/jjb/dcae/dcae-operation-utils.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -- project: - name: dcae-operation-utils - project-name: 'dcae-operation-utils' - subproject: - - 'utils': - pom: 'operation-utils/pom.xml' - pattern: 'operation-utils/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: - 'operation-utils/pom.xml' - trigger-job: - '{project-name}-{stream}-{subproject}-release-version2-java-daily' - - project: 'dcae/operation/utils' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dcae-operation-utils-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: '' diff --git a/jjb/dcae/dmaapbc.yaml b/jjb/dcae/dmaapbc.yaml deleted file mode 100644 index 52cc0321b..000000000 --- a/jjb/dcae/dmaapbc.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- - -- project: - name: dcae-dmaapbc - # job template iterators - project-name: 'dcae-dmaapbc' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - # apply to all jobs - project: 'dcae/dmaapbc' - mvn-settings: 'dcae-dmaapbc-settings' - # default to no op - mvn-goals: '--version' - # default to no op - mvn-goals-versioning: '--version' - files: '**' - archive-artifacts: '' - - jobs: - - '{project-name}-{stream}-daily-release-scm-mvn-script': - mvn-goals-versioning: - 'versions:set versions:update-child-modules versions:commit' - mvn-goals: 'clean deploy' - maven-deploy-properties: | - deployAtEnd=true - script: | - bash ./script-dmaapbc-docker-build.sh release - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-daily-release-scm-mvn-script' - - '{project-name}-{stream}-merge-scm-mvn-script': - mvn-goals: 'clean deploy' - script: | - bash ./script-dmaapbc-docker-build.sh merge - - '{project-name}-{stream}-verify-scm-mvn-script': - mvn-goals: 'clean install' - script: - bash ./script-dmaapbc-docker-build.sh verify - - '{project-name}-docker-image-blessing' diff --git a/jjb/dcae/pgaas.yaml b/jjb/dcae/pgaas.yaml deleted file mode 100644 index 32485326e..000000000 --- a/jjb/dcae/pgaas.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- - -- project: - name: dcae-pgaas - project-name: 'dcae-pgaas' - project: 'dcae/pgaas' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'dcae-pgaas-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g - mvn-goals: '--version' - mvn-goals-versioning: '--version' - extra-project: 'dcae/utils/buildtools' - extra-refspec: 'refs/heads/{branch}' - extra-branch: '{branch}' - checkout-dir: 'buildtools' - jobs: - - '{project-name}-{stream}-daily-release-2scm-mvn-script': - maven-deploy-properties: | - deployAtEnd=true - script: | - bash ./script-pgaas-deb-build.sh release - - '{project-name}-{stream}-merge-2scm-mvn-script': - script: | - bash ./script-pgaas-deb-build.sh merge - - '{project-name}-{stream}-verify-2scm-mvn-script': - script: | - bash ./script-pgaas-deb-build.sh verify diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index eadcdbe6c..27feb20e7 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/analytics' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 2f0e8871a..1990c0c63 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/collectors/snmptrap' stream: diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index 2dbee3a32..87e4fd467 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/collectors' stream: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 8e4825811..91ac246ab 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/deployments' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml index 0d4ff25f3..d34c32167 100644 --- a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/platform/blueprints' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml index 86f43212a..072e51031 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/platform/cdapbroker' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index 89ea2fe7d..043f40f6c 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/platform/cli' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 9d0e3e5db..af78dabfc 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/platform/configbinding' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index d0f8db34e..a8fd36dc3 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/platform/deployment-handler' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml index bce4863a1..14a67224d 100644 --- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -6,6 +6,10 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-shell-daily': + mvn-goals: 'clean package docker:build -DpushImage' + # No-op + script: '/bin/true' project: 'dcaegen2/platform/inventory-api' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml index d617db4f0..5be499843 100644 --- a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/platform/plugins' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index da23a5982..9e683cb03 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/platform/policy-handler' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 1108cc79d..1ec9e9580 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -5,7 +5,11 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' + - '{project-name}-{stream}-docker-java-shell-daily': + mvn-goals: 'clean package docker:build -DpushImage' + # No-op + script: '/bin/true' project: 'dcaegen2/platform/servicechange-handler' stream: diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index b1830e6cd..1e8120e28 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/platform' stream: diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 2eca1fabb..2d7e4319f 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2/utils' stream: diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index c9a81dced..e93bbd141 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -5,7 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' project: 'dcaegen2' stream: diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml new file mode 100644 index 000000000..ad94856fe --- /dev/null +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: dmaap-buscontroller + project-name: 'dmaap-buscontroller' + jobs: + - '{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: 'dmaap/buscontroller/pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + mvn-goals: 'clean install' + project: 'dmaap/buscontroller' + stream: + - 'master': + branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' + mvn-settings: 'dmaap-buscontroller-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/dcae/dcae-inventory.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 90e1f9de8..cc5c7d724 100644 --- a/jjb/dcae/dcae-inventory.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -1,25 +1,22 @@ --- - - project: - name: dcae-inventory - project-name: 'dcae-inventory' + name: dmaap-dbcapi + project-name: 'dmaap-dbcapi' jobs: - '{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' + site-pom: 'dmaap/dbcapi/pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' - - - project: 'dcae/dcae-inventory' + mvn-goals: 'clean install' + project: 'dmaap/dbcapi' stream: - 'master': branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' - mvn-settings: 'dcae-dcae-inventory-settings' + mvn-settings: 'dmaap-dbcapi-settings' files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 6ed9d2f62..655be2e6c 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': - site-pom: 'dmaap/dmaapclient/pom.xml' + site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'dmaap/messagerouter/dmaapclient' diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml index 60133ee5e..26a23d2b8 100644 --- a/jjb/dmaap/dmaap-messagerouter-docker.yaml +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -5,25 +5,12 @@ project-name: 'dmaap-messsagerouter-docker' jobs: - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java-checkstyle' - - '{project-name}-{stream}-merge-properties-java': - mvn_properties: - - docker.pull.registry=nexus3.onap.org:10001 - - docker.push.registry=nexus3.onap.org:10003 - - '{project-name}-{stream}-release-java-daily-checkstyle': - mvn_properties: - - skipDockerBuild=true - - skipDockerTag=true - - skipDockerPush=true - - '{project-name}-{stream}-docker-java-properties-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - maven-properties: | - skip.docker.build=false - skip.docker.tag=false - skip.docker.push=false - dmaap-messsagerouter-docker.registry=$ - + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily' + - '{project-name}-{stream}-docker-version-java-daily' + - '{project-name}-docker-image-blessing' project: 'dmaap/messagerouter/messageservice' stream: - 'master': @@ -31,4 +18,6 @@ mvn-settings: 'dmaap-messsagerouter-messageservice-settings' files: '**' archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: 'docker' build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 3672b5a27..5c5a78137 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': - site-pom: 'dmaap/messageservice/pom.xml' + site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'dmaap/messagerouter/messageservice' diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 20dbd21f6..5f4a16703 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-stage-site-java':
- site-pom: 'dmaap/mirroragent/pom.xml'
+ site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
mvn-goals: 'clean install'
project: 'dmaap/messagerouter/mirroragent'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index f5e8c109c..a2bba7f44 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': - site-pom: 'dmaap/msgrtr/pom.xml' + site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'dmaap/messagerouter/msgrtr' diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 23d74c6bc..a3f0a7655 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -572,6 +572,85 @@ # # The purpose of this job template is to run "maven version && maven clean # deploy" for projects using this template. + # This template supports subprojects. + # + # Required Variables: + # branch: git branch (eg. stable/lithium or master) + name: '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' + + 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}' + pom: '{pom}' + 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 -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 + # + # 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) diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh index 671f65f7c..10e1df938 100644 --- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -5,8 +5,10 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./openstack/newton/docker/*.* -chmod 755 ./openstack/ocata/docker/*.* +chmod 755 ./newton/docker/*.* +chmod 755 ./ocata/docker/*.* +chmod 755 ./windriver/docker/*.* -./openstack/newton/docker/build_image.sh -./openstack/ocata/docker/build_image.sh +./newton/docker/build_image.sh +./ocata/docker/build_image.sh +./windriver/docker/build_image.sh diff --git a/jjb/multicloud/multicloud-openstack-ocata-csit.yaml b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml new file mode 100644 index 000000000..dfef6f81a --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-ocata-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: multicloud-openstack-ocata-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-ocata' + stream: 'master' + functionality: + - 'functionality1': + trigger_jobs: + - 'multicloud-openstack-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 84404e3be..94ac2ab84 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -16,6 +16,10 @@ path: 'ocata' pattern: 'ocata/**' pom: 'ocata/pom.xml' + - 'windriver': + path: 'windriver' + pattern: 'windriver/**' + pom: 'windriver/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' diff --git a/jjb/ncomp/ncomp-cdap.yaml b/jjb/ncomp/ncomp-cdap.yaml deleted file mode 100644 index 5c7ead3cf..000000000 --- a/jjb/ncomp/ncomp-cdap.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: ncomp-cdap - project-name: 'ncomp-cdap' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version2-java-daily' - - project: 'ncomp/cdap' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'ncomp-cdap-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: '' diff --git a/jjb/ncomp/ncomp-core.yaml b/jjb/ncomp/ncomp-core.yaml deleted file mode 100644 index 2a3755d54..000000000 --- a/jjb/ncomp/ncomp-core.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: ncomp-core - project-name: 'ncomp-core' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version2-java-daily' - - project: 'ncomp/core' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'ncomp-core-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: '' diff --git a/jjb/ncomp/ncomp-docker.yaml b/jjb/ncomp/ncomp-docker.yaml deleted file mode 100644 index ec7b3ab30..000000000 --- a/jjb/ncomp/ncomp-docker.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: ncomp-docker - project-name: 'ncomp-docker' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version2-java-daily' - - project: 'ncomp/docker' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'ncomp-docker-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: '' diff --git a/jjb/ncomp/ncomp-maven.yaml b/jjb/ncomp/ncomp-maven.yaml deleted file mode 100644 index 91bd9731f..000000000 --- a/jjb/ncomp/ncomp-maven.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: ncomp-maven - project-name: 'ncomp-maven' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version2-java-daily' - - project: 'ncomp/maven' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'ncomp-maven-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: '' diff --git a/jjb/ncomp/ncomp-openstack.yaml b/jjb/ncomp/ncomp-openstack.yaml deleted file mode 100644 index 95164374b..000000000 --- a/jjb/ncomp/ncomp-openstack.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: ncomp-openstack - project-name: 'ncomp-openstack' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version2-java-daily' - - project: 'ncomp/openstack' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'ncomp-openstack-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: '' diff --git a/jjb/ncomp/ncomp-sirius-manager.yaml b/jjb/ncomp/ncomp-sirius-manager.yaml deleted file mode 100644 index 6df55e8cf..000000000 --- a/jjb/ncomp/ncomp-sirius-manager.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: ncomp-sirius-manager - project-name: 'ncomp-sirius-manager' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version2-java-daily' - - project: 'ncomp/sirius/manager' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'ncomp-sirius-manager-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: '' diff --git a/jjb/ncomp/ncomp-utils.yaml b/jjb/ncomp/ncomp-utils.yaml deleted file mode 100644 index b7a058404..000000000 --- a/jjb/ncomp/ncomp-utils.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- project: - name: ncomp-utils - project-name: 'ncomp-utils' - jobs: - - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java': - - '{project-name}-{stream}-release-version2-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version2-java-daily' - - project: 'ncomp/utils' - stream: - - 'master': - branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - mvn-settings: 'ncomp-utils-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: '' diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml new file mode 100644 index 000000000..1cd1eb94a --- /dev/null +++ b/jjb/sdnc/sdnc-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: sdnc-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'sdnc' + stream: 'master' + functionality: + - 'healthcheck': + trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' + robot-options: '' + branch: 'master' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 0ade93659..521fd483e 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -4,7 +4,7 @@ project-name: 'sdnc-northbound' jobs: - '{project-name}-{stream}-clm' - - '{project-name}-{stream}-verify-java-skip-tests' + - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 39135eb50..b3e2cbdbc 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -7,9 +7,6 @@ - '{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: 'vnfsdk/validation' stream: |