diff options
| -rw-r--r-- | jjb/clamp/clamp-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-configbinding.yaml | 18 | ||||
| -rw-r--r-- | jjb/integration/integration.yaml | 16 | ||||
| -rwxr-xr-x | jjb/vfc/build-gvnfm-vnflcm-docker-image.sh | 4 | ||||
| -rwxr-xr-x | jjb/vfc/build-nfvo-lcm-docker-image.sh | 11 | ||||
| -rw-r--r-- | jjb/vfc/vfc-gvnfm-vnflcm-java.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-lcm-java.yaml | 5 |
7 files changed, 47 insertions, 11 deletions
diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml index 9847abc12..3f567301a 100644 --- a/jjb/clamp/clamp-csit.yaml +++ b/jjb/clamp/clamp-csit.yaml @@ -9,7 +9,9 @@ functionality: - 'TCA': trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' - 'UIs': trigger_jobs: + - '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml index 95b2717b4..9d0e3e5db 100644 --- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml @@ -2,19 +2,21 @@ - project: name: dcaegen2-platform-configbinding project-name: 'dcaegen2-platform-configbinding' - subproject: - - platform-configbinding: - path: '.' - pattern: '**' jobs: - - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' project: 'dcaegen2/platform/configbinding' - stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dcaegen2-platform-configbinding-settings' + # due to a strange macro / variable translation problem this needs + # to be passed as a string block to properly get the properties + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' build-node: 'ubuntu1604-docker-8c-8g' 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/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-nfvo-lcm-docker-image.sh b/jjb/vfc/build-nfvo-lcm-docker-image.sh new file mode 100755 index 000000000..d570d18a2 --- /dev/null +++ b/jjb/vfc/build-nfvo-lcm-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/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-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index b148c01a2..ffd1cfe80 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -11,6 +11,11 @@ jobs: - '{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-lcm-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file |