diff options
-rw-r--r-- | jjb/dmaap/dmaap-buscontroller.yaml | 14 | ||||
-rw-r--r-- | jjb/dmaap/dmaap-dbcapi.yaml | 8 | ||||
-rw-r--r-- | jjb/global-templates-golang.yaml | 54 | ||||
-rw-r--r-- | jjb/integration/integration-bootstrap.yaml | 16 | ||||
-rw-r--r-- | jjb/integration/integration-devtool.yaml | 16 | ||||
-rw-r--r-- | jjb/optf/optf-has.yaml | 1 | ||||
-rw-r--r-- | jjb/testsuite/testsuite.yaml | 4 | ||||
-rw-r--r-- | jjb/vnfsdk/vnfsdk-ice-python.yaml | 19 | ||||
-rw-r--r-- | jjb/vvp/vvp-cms.yaml | 12 | ||||
-rw-r--r-- | jjb/vvp/vvp-engagementmgr.yaml | 12 | ||||
-rw-r--r-- | jjb/vvp/vvp-image-scanner.yaml | 12 | ||||
-rw-r--r-- | jjb/vvp/vvp-test-engine.yaml | 12 | ||||
-rw-r--r-- | jjb/vvp/vvp-validation-scripts.yaml | 12 |
13 files changed, 166 insertions, 26 deletions
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 53e1922da..2b0206ac0 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -8,11 +8,15 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-goals: 'clean install docker:build' - build-node: ubuntu1604-docker-8c-8g +# +# see DMAAP-334 for more details, but +# - '{project-name}-{stream}-docker-java-daily': +# doesn't support mvn-goals override, so trying this... + - '{project-name}-{stream}-docker-java-shell-daily': + mvn-goals: 'clean package -P docker docker:build -DpushImage' + # No-op + script: '/bin/true' + 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/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index d3ceac5e2..168fb6203 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -121,3 +121,57 @@ publishers: - infra-shiplogs: maven-version: '{maven-version}' + +- job-template: + # Job template for building & pushing docker images + # + # The purpose of this job template is to run: + # 1. login to the docker registry + # 2. run a specified shell builder + # + + name: '{project-name}-{stream}-docker-golang-shell-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + disabled: false + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + + scm: + - gerrit-trigger-scm: + refspec: '' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + # 12 AM UTC + - timed: 'H 12 * * *' + - gerrit-trigger-release-manually: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + + builders: + - provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + + - docker-login + + - shell: '{script}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}'
\ No newline at end of file diff --git a/jjb/integration/integration-bootstrap.yaml b/jjb/integration/integration-bootstrap.yaml deleted file mode 100644 index 9fc3f765e..000000000 --- a/jjb/integration/integration-bootstrap.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- project: - name: integration-bootstrap - project-name: 'integration' - project: 'integration' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - subproject: - - 'vagrant-onap': - path: 'bootstrap/vagrant-onap' - pattern: 'bootstrap/vagrant-onap/**' - stream: - - 'master': - branch: 'master' - mvn-settings: 'integration-settings' - build-node: ubuntu1604-basebuild-2c-1g diff --git a/jjb/integration/integration-devtool.yaml b/jjb/integration/integration-devtool.yaml new file mode 100644 index 000000000..15b436915 --- /dev/null +++ b/jjb/integration/integration-devtool.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: integration-devtool + project-name: 'integration-devtool' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + project: 'integration/devtool' + subproject: + - 'devtool': + path: '.' + pattern: '**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'integration-devtool-settings' + build-node: ubuntu1604-basebuild-2c-1g diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 95eba8ff1..ffb16c0db 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -16,6 +16,7 @@ - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': 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-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index 02adbb452..ab737a567 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -29,14 +29,29 @@ - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{subproject}-python-staging-{stream}' - project: - name: vnfsdk-ice-sonar + name: vnfsdk-ice-validation-scripts-sonar jobs: - gerrit-maven-sonar cron: 'H 11 * * *' + mvn-params: '-f validation-scripts/pom.xml' build-node: ubuntu1604-basebuild-4c-4g project: 'vnfsdk/ice' - project-name: 'vnfsdk-ice' + project-name: 'vnfsdk-ice-validation-scripts' + branch: 'master' + mvn-settings: 'vnfsdk-ice-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +- project: + name: vnfsdk-ice-ice-server-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + mvn-params: '-f ice-server/pom.xml' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vnfsdk/ice' + project-name: 'vnfsdk-ice-ice-server' branch: 'master' mvn-settings: 'vnfsdk-ice-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml index 0b456705c..8779ee071 100644 --- a/jjb/vvp/vvp-cms.yaml +++ b/jjb/vvp/vvp-cms.yaml @@ -19,3 +19,15 @@ - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' +- project: + name: vvp-cms-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vvp/cms' + project-name: 'vvp-cms' + branch: 'master' + mvn-settings: 'vvp-cms-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-engagementmgr.yaml b/jjb/vvp/vvp-engagementmgr.yaml index 98a5c9652..a01bd8459 100644 --- a/jjb/vvp/vvp-engagementmgr.yaml +++ b/jjb/vvp/vvp-engagementmgr.yaml @@ -19,3 +19,15 @@ - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' +- project: + name: vvp-engagementmgr-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vvp/engagementmgr' + project-name: 'vvp-engagementmgr' + branch: 'master' + mvn-settings: 'vvp-engagementmgr-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-image-scanner.yaml b/jjb/vvp/vvp-image-scanner.yaml index ca680e8e4..ca802c076 100644 --- a/jjb/vvp/vvp-image-scanner.yaml +++ b/jjb/vvp/vvp-image-scanner.yaml @@ -19,3 +19,15 @@ - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' +- project: + name: vvp-image-scanner-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vvp/image-scanner' + project-name: 'vvp-image-scanner' + branch: 'master' + mvn-settings: 'vvp-image-scanner-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml index 0957cee54..3c79f06b3 100644 --- a/jjb/vvp/vvp-test-engine.yaml +++ b/jjb/vvp/vvp-test-engine.yaml @@ -19,3 +19,15 @@ - '{project-name}-{stream}-docker-java-daily' docker-pom: 'pom.xml' mvn-profile: 'default' +- project: + name: vvp-test-engine-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vvp/test-engine' + project-name: 'vvp-test-engine' + branch: 'master' + mvn-settings: 'vvp-test-engine-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index b9cba04b4..349f68f70 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -16,3 +16,15 @@ jobs: - gerrit-python-xc-clm - '{project-name}-{stream}-{subproject}-verify-python' +- project: + name: vvp-validation-scripts-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'vvp/validation-scripts' + project-name: 'vvp-validation-scripts' + branch: 'master' + mvn-settings: 'vvp-validation-scripts-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' |