diff options
73 files changed, 685 insertions, 33 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml new file mode 100644 index 000000000..35d9fe876 --- /dev/null +++ b/jjb/aaf/aaf-authz-docker.yaml @@ -0,0 +1,34 @@ +--- + +- project: + name: aaf-authz-docker + project-name: 'aaf-authz-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 + aaf-authz-docker.registry=$ + + project: 'aaf/authz' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aaf-authz-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml index 1b2b31f76..01d5cfda1 100644 --- a/jjb/aai/aai-aai-service.yaml +++ b/jjb/aai/aai-aai-service.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml index 41a6805f6..7841a6773 100644 --- a/jjb/aai/aai-csit.yaml +++ b/jjb/aai/aai-csit.yaml @@ -9,5 +9,8 @@ functionality: - 'search-data-service': trigger_jobs: + - 'resources': + trigger_jobs: + - 'aai-resources-{stream}-aai-docker-java-version-daily' robot-options: '' branch: 'master' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index ef347d492..0fd44b9cb 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml index 762df8528..cd324f93d 100644 --- a/jjb/aai/aai-esr-server.yaml +++ b/jjb/aai/aai-esr-server.yaml @@ -7,9 +7,7 @@ - '{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}-docker-java-daily' project: 'aai/esr-server' stream: @@ -18,4 +16,6 @@ mvn-settings: 'aai-esr-server-settings' files: '**' archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index f93210b3c..04209dcbc 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 1269de9df..b2c1bd51a 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 80e0f52cf..eba07d899 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 426cacd63..a3ac26b35 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-aai-docker-java-daily': pom: 'pom.xml' mvn-goals: 'docker:build' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 8d65752ec..fa198c90f 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -7,7 +7,6 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-docker-image-blessing' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml new file mode 100644 index 000000000..1a364df32 --- /dev/null +++ b/jjb/appc/appc-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: appc-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'appc' + stream: 'master' + functionality: + - 'healthcheck': + trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' + robot-options: '' + branch: 'master' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index c5b0dd134..daa68ad9f 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-clm' - '{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-daily' - '{project-name}-{stream}-docker-version-java-daily' - '{project-name}-docker-image-blessing' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 8f41b5d9e..e1ff25cc8 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -23,3 +23,4 @@ deployAtEnd=true files: '**' archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index ed24c5aa7..99c71f3a3 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -23,3 +23,4 @@ deployAtEnd=true files: '**' archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei-csit.yaml b/jjb/cli/cli-csit.yaml index 23243c299..798b16c19 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei-csit.yaml +++ b/jjb/cli/cli-csit.yaml @@ -1,15 +1,13 @@ --- - - project: - name: vfc-nfvo-driver-svnfm-huawei-csit + name: cli-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-driver-svnfm' + project-name: 'cli' stream: 'master' functionality: - 'sanity-check': trigger_jobs: - - 'vfc-nfvo-driver-svnfm-huawei-master-docker-version-java-daily' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index ee00ef6b1..33f216bae 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/apod-analytics.yaml @@ -7,8 +7,6 @@ stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
# apply to all jobs
project: 'dcaegen2/analytics/tca'
diff --git a/jjb/dmaap/dmaap-datarouter-docker.yaml b/jjb/dmaap/dmaap-datarouter-docker.yaml new file mode 100644 index 000000000..873affde8 --- /dev/null +++ b/jjb/dmaap/dmaap-datarouter-docker.yaml @@ -0,0 +1,34 @@ +---
+
+- project:
+ name: dmaap-datarouter-docker
+ project-name: 'dmaap-datarouter-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-datarouter-docker.registry=$
+
+ project: 'dmaap/datarouter'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'dmaap-datarouter-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-docker-8c-8g
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 6e8a84602..89e78eca7 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.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/datarouter/pom.xml' + site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'dmaap/datarouter' diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml new file mode 100644 index 000000000..60133ee5e --- /dev/null +++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml @@ -0,0 +1,34 @@ +--- + +- project: + name: dmaap-messsagerouter-docker + 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: 'dmaap/messagerouter/messageservice' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dmaap-messsagerouter-messageservice-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml index c6bec58ec..884c3706b 100644 --- a/jjb/doc/doc-templates-rtd.yaml +++ b/jjb/doc/doc-templates-rtd.yaml @@ -58,7 +58,11 @@ builders: - shell: | if [ "$GERRIT_PROJECT" != "doc" ]; then - cd docs/submodules/$GERRIT_PROJECT + if [ -d docs/submodules/$GERRIT_PROJECT.git ]; then + cd docs/submodules/$GERRIT_PROJECT.git + else + cd docs/submodules/$GERRIT_PROJECT + fi git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD else git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD diff --git a/jjb/global-jjb b/jjb/global-jjb -Subproject 0ee567bb454432e6e4ca1bc6f45431b68e95bad +Subproject 633d8e37f1796d6a1be9c3e5ad85f0322622fe6 diff --git a/jjb/holmes/holmes-csit.yaml b/jjb/holmes/holmes-csit.yaml new file mode 100644 index 000000000..02ce537fb --- /dev/null +++ b/jjb/holmes/holmes-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: holmes-rule-management-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'holmes-rule-management' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'holmes-rule-management-master-docker-java-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml index 7fa0ff47a..5c5d39cdf 100644 --- a/jjb/integration/integration-csit.yaml +++ b/jjb/integration/integration-csit.yaml @@ -9,5 +9,7 @@ functionality: - 'functionality1': trigger_jobs: + - 'vCPE': + trigger_jobs: robot-options: '' branch: 'master' diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml new file mode 100644 index 000000000..1243121eb --- /dev/null +++ b/jjb/integration/integration.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: integration + project-name: 'integration' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + project: 'integration' + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml new file mode 100644 index 000000000..892a99cb4 --- /dev/null +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -0,0 +1,19 @@ +--- + +- project: + name: modeling-toscaparsers-javatoscachecker + project-name: 'modeling-toscaparsers-javatoscachecker' + project: 'modeling/toscaparsers' + stream: + - 'master': + branch: 'master' + mvn-settings: 'modeling-toscaparsers-settings' + build-node: ubuntu1604-basebuild-4c-4g + subproject: + - 'javatoscachecker': + pattern: 'javatoscachecker/**' + pom: 'javatoscachecker/pom.xml' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-java-daily' diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml new file mode 100644 index 000000000..3f2fe9621 --- /dev/null +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -0,0 +1,22 @@ +--- + +- project: + name: modeling-toscaparsers-nfvparser + project-name: 'modeling-toscaparsers-nfvparser' + project: 'modeling/toscaparsers' + stream: + - 'master': + branch: 'master' + mvn-settings: 'modeling-toscaparsers-settings' + build-node: ubuntu1604-basebuild-4c-4g + subproject: + - 'nfvparser': + path: 'nfvparser/' + pattern: 'nfvparser/**' + pom: 'nfvparser/pom.xml' + jobs: + - '{project-name}-{stream}-clm' + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-java-daily' diff --git a/jjb/msb/msb-csit.yaml b/jjb/msb/msb-csit.yaml new file mode 100644 index 000000000..9dada47b6 --- /dev/null +++ b/jjb/msb/msb-csit.yaml @@ -0,0 +1,23 @@ +--- +- project: + name: msb-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'msb' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'msb-discovery-master-docker-java-version-shell-daily' + - 'rest-service': + trigger_jobs: + - 'msb-discovery-master-docker-java-version-shell-daily' + - 'tcp-service': + trigger_jobs: + - 'msb-discovery-master-docker-java-version-shell-daily' + - 'iag-redirect-discovery': + trigger_jobs: + - 'msb-discovery-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/build-multicloud-framework-docker-image.sh b/jjb/multicloud/build-multicloud-framework-docker-image.sh new file mode 100644 index 000000000..b749b30ef --- /dev/null +++ b/jjb/multicloud/build-multicloud-framework-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./multivimbroker/docker/*.* + +./multivimbroker/docker/build_image.sh
\ No newline at end of file diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh new file mode 100644 index 000000000..671f65f7c --- /dev/null +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./openstack/newton/docker/*.* +chmod 755 ./openstack/ocata/docker/*.* + +./openstack/newton/docker/build_image.sh +./openstack/ocata/docker/build_image.sh diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh new file mode 100644 index 000000000..e432e86f9 --- /dev/null +++ b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./vio/docker/*.* + +./vio/docker/build_image.sh diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 4e2f160a7..6535e8420 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -14,6 +14,11 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-framework-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g 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-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index d60aba345..f6927adba 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -14,6 +14,11 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 1fa18a702..84404e3be 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -12,10 +12,19 @@ path: 'newton' pattern: 'newton/**' pom: 'newton/pom.xml' + - 'ocata': + path: 'ocata' + pattern: 'ocata/**' + pom: 'ocata/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-multicloud-openstack-docker-image.sh' files: '**' archive-artifacts: '' build-node: 'ubuntu1604-memcached-4c-4g' diff --git a/jjb/oom/build-registrator-docker-image.sh b/jjb/oom/build-registrator-docker-image.sh new file mode 100644 index 000000000..9821bfca2 --- /dev/null +++ b/jjb/oom/build-registrator-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 *.* + +./build4docker.sh diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml new file mode 100644 index 000000000..a0e9bc0fc --- /dev/null +++ b/jjb/oom/oom-registrator.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: oom-registrator + project-name: 'oom-registrator' + 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}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-registrator-docker-image.sh' + project: 'oom/registrator' + stream: + - 'master': + branch: 'master' + mvn-settings: 'oom-registrator-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 942c27366..e758f06d4 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -2,7 +2,14 @@ - project: name: oparent project-name: 'oparent' + subproject: + - 'oparent-odlparent': + pom: 'oparent-odlparent/pom.xml' + pattern: 'oparent-odlparent/**' jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version2-java-daily' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/portal/portal-csit.yaml b/jjb/portal/portal-csit.yaml new file mode 100644 index 000000000..a8e961223 --- /dev/null +++ b/jjb/portal/portal-csit.yaml @@ -0,0 +1,13 @@ +- project: + name: portal-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'portal' + stream: 'master' + functionality: + - 'testsuite': + trigger_jobs: + - 'portal-docker-{stream}-merge-docker-script' + robot-options: '' + branch: 'master' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 89e59c902..38fbcd401 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 135e6071d..23ef85ad1 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -18,6 +18,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdc-sdc-distribution-client-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml new file mode 100644 index 000000000..6b59c5259 --- /dev/null +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -0,0 +1,17 @@ +--- + +- project: + name: sdc-sdc-docker-base + project-name: 'sdc-sdc-docker-base' + jobs: + - '{project-name}-{stream}-sdc-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'default' + project: 'sdc/sdc-docker-base' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-sdc-docker-base-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-8c-8g diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 804d26518..230fdbb19 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml new file mode 100644 index 000000000..38c7b34bf --- /dev/null +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: usecase-ui-server + project-name: 'usecase-ui-server' + project: 'usecase-ui/server' + stream: + - 'master': + branch: 'master' + mvn-settings: 'usecase-ui-server-settings' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/build-driver-ems-docker-image.sh b/jjb/vfc/build-driver-ems-docker-image.sh new file mode 100755 index 000000000..6804198b5 --- /dev/null +++ b/jjb/vfc/build-driver-ems-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./ems/microservice-standalone/src/main/assembly/docker/*.* + +./ems/microservice-standalone/src/main/assembly/docker/build_image.sh + diff --git a/jjb/vfc/build-driver-zte-sfc-docker-image.sh b/jjb/vfc/build-driver-zte-sfc-docker-image.sh new file mode 100755 index 000000000..8435ae139 --- /dev/null +++ b/jjb/vfc/build-driver-zte-sfc-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./zte/sfc-driver/plugin-standalone/src/main/assembly/docker/*.* + +./zte/sfc-driver/plugin-standalone/src/main/assembly/docker/build_image.sh + diff --git a/jjb/vfc/build-gvnfm-driver-docker-image.sh b/jjb/vfc/build-gvnfm-driver-docker-image.sh new file mode 100755 index 000000000..ac6b90781 --- /dev/null +++ b/jjb/vfc/build-gvnfm-driver-docker-image.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./gvnfmadapter/docker/*.* +./gvnfmadapter/docker/build_image.sh + +chmod 755 ./juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/*.* +./juju/juju-vnfmadapter/Juju-vnfmadapterService/docker/build_image.sh + diff --git a/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh b/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh index d570d18a2..e4c743092 100755 --- a/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh +++ b/jjb/vfc/build-gvnfm-vnflcm-docker-image.sh @@ -5,7 +5,7 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./docker/*.* +chmod 755 ./lcm/docker/*.* -./docker/build_image.sh +./lcm/docker/build_image.sh diff --git a/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh b/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh new file mode 100755 index 000000000..b16fa2deb --- /dev/null +++ b/jjb/vfc/build-gvnfm-vnfmgr-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./mgr/docker/*.* + +./mgr/docker/build_image.sh + diff --git a/jjb/vfc/build-gvnfm-vnfres-docker-image.sh b/jjb/vfc/build-gvnfm-vnfres-docker-image.sh new file mode 100755 index 000000000..dbfd2caaf --- /dev/null +++ b/jjb/vfc/build-gvnfm-vnfres-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./res/docker/*.* + +./res/docker/build_image.sh + diff --git a/jjb/vfc/build-nfvo-catalog-docker-image.sh b/jjb/vfc/build-nfvo-catalog-docker-image.sh new file mode 100755 index 000000000..d570d18a2 --- /dev/null +++ b/jjb/vfc/build-nfvo-catalog-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./docker/*.* + +./docker/build_image.sh + diff --git a/jjb/vfc/build-nfvo-resmanagement-docker-image.sh b/jjb/vfc/build-nfvo-resmanagement-docker-image.sh new file mode 100755 index 000000000..539ea3e52 --- /dev/null +++ b/jjb/vfc/build-nfvo-resmanagement-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./ResmanagementService/docker/*.* + +./ResmanagementService/docker/build_image.sh + diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh new file mode 100755 index 000000000..89860d94c --- /dev/null +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./zte/vmanager/docker/*.* +./zte/vmanager/docker/build_image.sh + +chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.* +./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml new file mode 100644 index 000000000..7280f735e --- /dev/null +++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-gvnfm-vnflcm-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-gvnfm-vnflcm' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index e751d4855..36d702479 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -16,7 +16,7 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'lcm/pom.xml' + docker-pom: 'pom.xml' mvn-goals: 'install' script: !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh' diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml new file mode 100644 index 000000000..f8436a65a --- /dev/null +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-gvnfm-vnfmgr-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-gvnfm-vnfmgr' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-gvnfm-vnfmgr-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 5fec8ccd4..05c01dd85 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -14,6 +14,11 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml new file mode 100644 index 000000000..afb3ccd3d --- /dev/null +++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-gvnfm-vnfres-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-gvnfm-vnfres' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index da8460d62..02c95959a 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -15,6 +15,11 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-catalog-csit.yaml b/jjb/vfc/vfc-nfvo-catalog-csit.yaml new file mode 100644 index 000000000..8a4269cb7 --- /dev/null +++ b/jjb/vfc/vfc-nfvo-catalog-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-nfvo-catalog-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-nfvo-catalog' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-nfvo-catalog-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 2856dd649..208e89ccb 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -16,6 +16,11 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-nfvo-catalog-docker-image.sh' files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml new file mode 100644 index 000000000..312528866 --- /dev/null +++ b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-nfvo-driver-ems-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-nfvo-driver-ems' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index ef5518732..7da4da9c8 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -16,6 +16,11 @@ - '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-java-daily'
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-driver-ems-docker-image.sh'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml new file mode 100644 index 000000000..f433b0639 --- /dev/null +++ b/jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-nfvo-driver-sfc-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-nfvo-driver-sfc' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-nfvo-driver-sfc-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 47634ac7c..9fef201ac 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -15,6 +15,11 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-java-daily' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-driver-zte-sfc-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 7fa3c2538..db40e10c8 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -14,6 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-java-daily' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml new file mode 100644 index 000000000..3edde732b --- /dev/null +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-nfvo-driver-vnfm-gvnfm-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-nfvo-driver-vnfm-gvnfm' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 0d57efa2d..5dbd4fe8d 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -15,9 +15,11 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-docker-version-java-daily': + - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' - mvn-profile: 'docker' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-gvnfm-driver-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml new file mode 100644 index 000000000..d97117683 --- /dev/null +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-nfvo-driver-vnfm-svnfm-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-nfvo-driver-vnfm-svnfm' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-nfvo-driver-vnfm-svnfm-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml new file mode 100644 index 000000000..8698735ff --- /dev/null +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml @@ -0,0 +1,19 @@ +--- + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-docker + project-name: 'vfc-nfvo-driver-vnfm-svnfm' + project: 'vfc/nfvo/driver/vnfm/svnfm' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + jobs: + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml new file mode 100644 index 000000000..f5ad31137 --- /dev/null +++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: vfc-nfvo-lcm-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'vfc-nfvo-lcm' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + - 'vfc-nfvo-lcm-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 2bf363c3c..ecab6e123 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -8,12 +8,13 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' build-node: ubuntu1604-basebuild-4c-4g jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-docker-version-java-daily': + - '{project-name}-{stream}-release-java-daily' + - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' - mvn-profile: 'docker' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-nfvo-resmanagement-docker-image.sh' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 02de1a340..890ff8604 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -7,13 +7,13 @@ - '{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: 'vnfmarket-be/deployment/docker/pom.xml' + pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' mvn-goals: 'docker:build' docker-image-name: 'onap/refrepo' + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' + mvn-profile: 'docker' project: 'vnfsdk/refrepo' stream: diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml new file mode 100644 index 000000000..39135eb50 --- /dev/null +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: vnfsdk-validation + project-name: 'vnfsdk-validation' + 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' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + + project: 'vnfsdk/validation' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vnfsdk-validation-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g |