diff options
26 files changed, 253 insertions, 29 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-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-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/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/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/vfc/build-svnfm-huawei-docker-image.sh b/jjb/multicloud/build-multicloud-framework-docker-image.sh index 964043019..b749b30ef 100755..100644 --- a/jjb/vfc/build-svnfm-huawei-docker-image.sh +++ b/jjb/multicloud/build-multicloud-framework-docker-image.sh @@ -5,7 +5,6 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./VnfmadapterService/docker/*.* - -./VnfmadapterService/docker/build_image.sh +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/vfc/build-driver-svnfm-zte-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh index fbc6756a8..e432e86f9 100755..100644 --- a/jjb/vfc/build-driver-svnfm-zte-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh @@ -5,7 +5,6 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./zte/vmanager/docker/*.* - -./zte/vmanager/docker/build_image.sh +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-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/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/vfc/build-driver-zte-sfc-docker-image.sh b/jjb/vfc/build-driver-zte-sfc-docker-image.sh index ef5ef985b..8435ae139 100755 --- a/jjb/vfc/build-driver-zte-sfc-docker-image.sh +++ b/jjb/vfc/build-driver-zte-sfc-docker-image.sh @@ -5,7 +5,7 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./zte/sfc-driver/docker/*.* +chmod 755 ./zte/sfc-driver/plugin-standalone/src/main/assembly/docker/*.* -./zte/sfc-driver/docker/build_image.sh +./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 index 3560e41df..ac6b90781 100755 --- a/jjb/vfc/build-gvnfm-driver-docker-image.sh +++ b/jjb/vfc/build-gvnfm-driver-docker-image.sh @@ -6,6 +6,8 @@ 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-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-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-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-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-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 36632508c..db40e10c8 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -15,11 +15,6 @@ - '{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: 'huawei/vnfmadapter/pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-svnfm-huawei-docker-image.sh' 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-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-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml index c295f25fe..23a611774 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -15,11 +15,6 @@ 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-driver-svnfm-zte-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file 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 |