diff options
| -rw-r--r-- | jjb/aaf/build-sshsm.sh | 15 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-utils.yaml | 6 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller.yaml | 4 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-dbcapi.yaml | 8 | ||||
| -rw-r--r-- | jjb/testsuite/testsuite.yaml | 4 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml | 14 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-pkgtools-python.yaml | 14 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-ves-agent.yaml | 3 |
8 files changed, 44 insertions, 24 deletions
diff --git a/jjb/aaf/build-sshsm.sh b/jjb/aaf/build-sshsm.sh index e26d44bfd..f5702cf85 100644 --- a/jjb/aaf/build-sshsm.sh +++ b/jjb/aaf/build-sshsm.sh @@ -4,17 +4,6 @@ CURRENTDIR="$(pwd)" echo $CURRENTDIR -echo 'Building the SoftHSMv2...' +echo 'Building AAF/sshsm project' +sh build.sh -cd SoftHSMv2 -sh autogen.sh -./configure -make check -cd .. - -echo 'Building the TPM2-Plugin...' - -cd TPM2-Plugin -./bootstrap -./configure -make diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index d6dcb0168..96b95bf28 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -7,8 +7,8 @@ - 'dcaeapplib': tox-dir: dcaeapplib/ tox-envs: '' - - 'onap-dcae-dbs-docker-client': - tox-dir: onap-dcae-dbs-docker-client/ + - 'onap-dcae-cbs-docker-client': + tox-dir: onap-dcae-cbs-docker-client/ tox-envs: '' - 'onap-dcae-dcaepolicy-lib': tox-dir: onap-dcae-dcaepolicy-lib/ @@ -40,7 +40,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1604-basebuild-4c-4g' - project: name: dcaegen2-utils-sonar jobs: diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 53e1922da..7db34c760 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -9,10 +9,10 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-java-daily': + mvn-goals: 'clean package docker:build -DpushImage' docker-pom: 'pom.xml' mvn-profile: 'docker' - mvn-goals: 'clean install docker:build' - build-node: ubuntu1604-docker-8c-8g + project: 'dmaap/buscontroller' stream: - 'master': diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 06f6b81f6..602734c79 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -8,12 +8,18 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' project: 'dmaap/dbcapi' + mvn-settings: 'dmaap-dbcapi-settings' stream: - 'master': branch: 'master' - mvn-settings: 'dmaap-dbcapi-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: '' + - project: name: dmaap-dbcapi-sonar jobs: diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index 44d2db1bf..f2e862d8c 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -27,6 +27,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' + - 'amsterdam': + branch: 'amsterdam' mvn-settings: 'testsuite-settings' diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 55fcb9a43..1e129ee25 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -7,6 +7,7 @@ path: '.' pattern: '**' project: 'vnfsdk/dovetail-integration' + pom: 'pom.xml' stream: - 'master': branch: 'master' @@ -15,3 +16,16 @@ jobs: - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-{subproject}-merge-java' +- project: + name: vnfsdk-dovetail-integration-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vnfsdk/dovetail-integration' + project-name: 'vnfsdk-dovetail-integration' + branch: 'master' + mvn-settings: 'vnfsdk-dovetail-integration-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml index d8864cda4..2e1a7e6ac 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml @@ -1,5 +1,4 @@ --- - - project: name: vnfsdk-pkgtools project-name: 'vnfsdk-pkgtools' @@ -14,6 +13,17 @@ mvn-settings: 'vnfsdk-pkgtools-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - - gerrit-maven-clm - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' +- project: + name: vnfsdk-pkgtools-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vnfsdk/pkgtools' + project-name: 'vnfsdk-pkgtools' + branch: 'master' + mvn-settings: 'vnfsdk-pkgtools-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index a313f9b83..a41e68df2 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -7,7 +7,8 @@ pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' pattern: 'veslibrary/**' jobs: - - gerrit-maven-clm + - gerrit-maven-clm: + mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' |