diff options
| -rw-r--r-- | jjb/aai/aai-esr-server.yaml | 6 | ||||
| -rw-r--r-- | jjb/cli/cli-csit.yaml | 13 | ||||
| -rw-r--r-- | jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml | 19 | ||||
| -rw-r--r--[-rwxr-xr-x] | jjb/multicloud/build-multicloud-framework-docker-image.sh (renamed from jjb/vfc/build-driver-svnfm-zte-docker-image.sh) | 5 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-framework-java.yaml | 5 | ||||
| -rw-r--r-- | jjb/oparent/oparent.yaml | 7 | ||||
| -rwxr-xr-x | jjb/vfc/build-driver-zte-sfc-docker-image.sh | 4 | ||||
| -rwxr-xr-x | jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh | 12 | ||||
| -rwxr-xr-x | jjb/vfc/build-svnfm-huawei-docker-image.sh | 11 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-sfc-csit.yaml | 14 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 5 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml | 19 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml | 5 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-validation.yaml | 21 |
14 files changed, 117 insertions, 29 deletions
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/cli/cli-csit.yaml b/jjb/cli/cli-csit.yaml new file mode 100644 index 000000000..798b16c19 --- /dev/null +++ b/jjb/cli/cli-csit.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: cli-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'cli' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: + robot-options: '' + branch: 'master' 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/vfc/build-driver-svnfm-zte-docker-image.sh b/jjb/multicloud/build-multicloud-framework-docker-image.sh index fbc6756a8..b749b30ef 100755..100644 --- a/jjb/vfc/build-driver-svnfm-zte-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 ./zte/vmanager/docker/*.* - -./zte/vmanager/docker/build_image.sh +chmod 755 ./multivimbroker/docker/*.* +./multivimbroker/docker/build_image.sh
\ No newline at end of file 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/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-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/build-svnfm-huawei-docker-image.sh b/jjb/vfc/build-svnfm-huawei-docker-image.sh deleted file mode 100755 index 964043019..000000000 --- a/jjb/vfc/build-svnfm-huawei-docker-image.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./VnfmadapterService/docker/*.* - -./VnfmadapterService/docker/build_image.sh - 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-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 |