diff options
48 files changed, 453 insertions, 36 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index ccf5f16d6..a1dd7a479 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -6,8 +6,10 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily': - pom: 'aaf/authz/pom.xml' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'aaf/authz/pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'aaf/authz' stream: diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml index 3d6f8ba65..f10fc82b8 100644 --- a/jjb/aaf/aaf-cadi.yaml +++ b/jjb/aaf/aaf-cadi.yaml @@ -6,8 +6,10 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily': - pom: 'aaf/cadi/pom.xml' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'aaf/cadi/pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'aaf/cadi' stream: diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml index 681c16d18..b3bfbd669 100644 --- a/jjb/aaf/aaf-inno.yaml +++ b/jjb/aaf/aaf-inno.yaml @@ -6,8 +6,10 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-java-daily': - pom: 'aaf/inno/pom.xml' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'aaf/inno/pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' mvn-goals: 'clean install' project: 'aaf/inno' stream: diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml new file mode 100644 index 000000000..41a6805f6 --- /dev/null +++ b/jjb/aai/aai-csit.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: aai-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'aai' + stream: 'master' + functionality: + - 'search-data-service': + trigger_jobs: + robot-options: '' + branch: 'master' diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml new file mode 100644 index 000000000..6fc991f0f --- /dev/null +++ b/jjb/ccsdk/dashboard.yaml @@ -0,0 +1,25 @@ +--- +- project: + name: ccsdk-dashboard + project-name: 'ccsdk-dashboard' + 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: 'ccsdk/dashboard' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ccsdk-dashboard-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: '' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 5922c837f..8ed8716fd 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 3cc952de6..e8a667d17 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-parent-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 diff --git a/jjb/ccsdk/platform-blueprints.yaml b/jjb/ccsdk/platform-blueprints.yaml new file mode 100644 index 000000000..969d30ef7 --- /dev/null +++ b/jjb/ccsdk/platform-blueprints.yaml @@ -0,0 +1,25 @@ +--- +- project: + name: ccsdk-platform-blueprints + project-name: 'ccsdk-platform-blueprints' + 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: 'ccsdk/platform/blueprints' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ccsdk-platform-blueprints-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: '' diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml new file mode 100644 index 000000000..cf7e85cd6 --- /dev/null +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -0,0 +1,25 @@ +--- +- project: + name: ccsdk-platform-nbapi + project-name: 'ccsdk-platform-nbapi' + 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: 'ccsdk/platform/nbapi' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ccsdk-platform-nbapi-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: '' diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml new file mode 100644 index 000000000..b21580115 --- /dev/null +++ b/jjb/ccsdk/platform-plugins.yaml @@ -0,0 +1,25 @@ +--- +- project: + name: ccsdk-platform-plugins + project-name: 'ccsdk-platform-plugins' + 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: 'ccsdk/platform/plugins' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ccsdk-platform-plugins-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: '' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index d2440fff3..8f41b5d9e 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-sli-adaptors-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 diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 548eaeb00..ed24c5aa7 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-sli-core-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 diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 4e3306f3f..1e505f64d 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-sli-northbound-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 diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index f6d75ea91..be14584e0 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-sli-plugins-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 diff --git a/jjb/ccsdk/storage-esaas.yaml b/jjb/ccsdk/storage-esaas.yaml index 5c91767aa..49a957233 100644 --- a/jjb/ccsdk/storage-esaas.yaml +++ b/jjb/ccsdk/storage-esaas.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-storage-esaas-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 diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index e24f67fd2..e1831e539 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'ccsdk-storage-pgaas-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 diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml new file mode 100644 index 000000000..191aa049a --- /dev/null +++ b/jjb/ccsdk/utils.yaml @@ -0,0 +1,25 @@ +--- +- project: + name: ccsdk-utils + project-name: 'ccsdk-utils' + 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: 'ccsdk/utils' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ccsdk-utils-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: '' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 3db9e4ac3..4589c4f4c 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -11,9 +11,11 @@ - 'datarouter-prov': pom: 'datarouter-prov/pom.xml' pattern: 'datarouter-prov/**' + mvn-goals: 'clean install' - 'datarouter-node': pom: 'datarouter-node/pom.xml' pattern: 'datarouter-node/**' + mvn-goals: 'clean install' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' diff --git a/jjb/dmaap/dmaap-messagerouter.yaml b/jjb/dmaap/dmaap-messagerouter.yaml index 7156f945e..a0c806e00 100644 --- a/jjb/dmaap/dmaap-messagerouter.yaml +++ b/jjb/dmaap/dmaap-messagerouter.yaml @@ -11,12 +11,15 @@ - 'Msgrtr': pom: 'Msgrtr/pom.xml' pattern: 'Msgrtr/**' + mvn-goals: 'clean install' - 'dmaap': pom: 'dmaap/pom.xml' pattern: 'dmaap/**' + mvn-goals: 'clean install' - 'dmaapClient': pom: 'dmaapClient/pom.xml' pattern: 'dmaapClient/**' + mvn-goals: 'clean install' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' diff --git a/jjb/doc/doc-post-rtd.sh b/jjb/doc/doc-post-rtd.sh new file mode 100644 index 000000000..5c8d8c52f --- /dev/null +++ b/jjb/doc/doc-post-rtd.sh @@ -0,0 +1,9 @@ +#!/bin/bash +if [ "$GERRIT_BRANCH" == "master" ]; then + RTD_BUILD_VERSION=latest +else + RTD_BUILD_VERSION="${{GERRIT_BRANCH/\//-}}" +fi + +# shellcheck disable=SC1083 +curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/{rtdproject} diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml new file mode 100644 index 000000000..4f54322cd --- /dev/null +++ b/jjb/doc/doc-templates-rtd.yaml @@ -0,0 +1,143 @@ +--- +- job-template: + # Job template for verifying Sphinx/Restructured Text for RTD + # + # The purpose of this job template is verify documentation source + # + # Required Variables: + # branch: git branch + # Optional Variables: + # path: directory containing the project's tox.ini relative to + # the workspace. The default is the project root. + # pattern: ant file-path pattern relative to the workspace used to + # trigger the job + + name: '{project-name}-{stream}-verify-rtd' + path: '$WORKSPACE' + + project-type: freestyle + concurrent: true + node: '{build-node}' + + 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}' + - maven-exec: + maven-version: '{maven-version}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '**' + branch: '{branch}' + files: 'docs/**/*.rst' + - timed: 'H H * * *' + + builders: + - shell: | + if [ "$GERRIT_PROJECT" != "doc" ]; then + cd docs/submodules/$GERRIT_PROJECT + git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD + else + git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD + fi + - shell: | + #!/bin/bash + virtualenv $WORKSPACE/venv-tox + source $WORKSPACE/venv-tox/bin/activate + pip install --upgrade pip + pip install --upgrade tox argparse + pip freeze + cd $WORKSPACE/{path} + tox + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: + # Job template for merging/publishing Sphinx/Restructured Text at RTD + # + # The purpose of this job template is to trigger updates after + # a merge of documentation source in gerrit + # + # Required Variables: + # branch: git branch + # rtdproject: name of a project at readthedocs.io + # Optional Variables: + # path: directory containing the project's tox.ini relative to + # the workspace. The default is the project root. + # pattern: ant file-path pattern relative to the workspace used to + # trigger the job + + name: '{project-name}-{stream}-merge-rtd' + path: '$WORKSPACE' + + project-type: freestyle + concurrent: false + node: '{build-node}' + + 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}' + - maven-exec: + maven-version: '{maven-version}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit: + server-name: '{server-name}' + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: '**' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: docs/**/*.rst + + builders: + - shell: !include-raw: doc-post-rtd.sh + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml new file mode 100644 index 000000000..40d592240 --- /dev/null +++ b/jjb/doc/doc.yaml @@ -0,0 +1,17 @@ +--- +- project: + name: doc + project-name: 'doc' + + jobs: + - '{project-name}-{stream}-verify-rtd': + build-node: centos7-basebuild-4c-4g + - '{project-name}-{stream}-merge-rtd' + + project: 'doc' + + rtdproject: 'onap' + + stream: + - master: + branch: 'master' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index ebd8ef381..7a6f273fe 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' project: 'holmes/common' stream: diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml index f795f324c..8b5468611 100644 --- a/jjb/holmes/holmes-dsa.yaml +++ b/jjb/holmes/holmes-dsa.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' project: 'holmes/dsa' stream: diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 3b18f85da..0e5c856e2 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' project: 'holmes/engine-management' stream: diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 01f553c23..cf4b5e0e1 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -6,6 +6,7 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' project: 'holmes/rule-management' stream: diff --git a/jjb/msb/build-apigateway-docker-image.sh b/jjb/msb/build-apigateway-docker-image.sh new file mode 100644 index 000000000..6ca48a2c7 --- /dev/null +++ b/jjb/msb/build-apigateway-docker-image.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 *.* + +./build4basedocker.sh +./build4docker.sh + diff --git a/jjb/msb/build-docker-image.sh b/jjb/msb/build-discovery-docker-image.sh index 9821bfca2..ae7f5a275 100644 --- a/jjb/msb/build-docker-image.sh +++ b/jjb/msb/build-discovery-docker-image.sh @@ -8,3 +8,4 @@ echo $CURRENTDIR chmod 755 *.* ./build4docker.sh + diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 54f178562..69042cb5f 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -14,7 +14,7 @@ docker-pom: 'pom.xml' mvn-goals: 'install' script: - !include-raw-escape: 'build-docker-image.sh' + !include-raw-escape: 'build-apigateway-docker-image.sh' project: 'msb/apigateway' stream: diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index f35572caa..bb20c4b03 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -10,7 +10,11 @@ - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-discovery-docker-image.sh' project: 'msb/discovery' stream: - 'master': diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml new file mode 100644 index 000000000..3f3544031 --- /dev/null +++ b/jjb/msb/msb-java-sdk.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: msb-java-sdk + project-name: 'msb-java-sdk' + jobs: + - '{project-name}-{stream}-clm' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + project: 'msb/java-sdk' + stream: + - 'master': + branch: 'master' + mvn-settings: 'msb-java-sdk-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 0161aa1ab..942c27366 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -5,6 +5,7 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' project: 'oparent' stream: - 'master': @@ -12,4 +13,4 @@ mvn-settings: 'oparent-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 304f7ce36..e50cffa90 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -3,7 +3,8 @@ name: policy-engine project-name: 'policy-engine' jobs: - - '{project-name}-{stream}-clm' + - '{project-name}-{stream}-clm': + build-node: 'ubuntu1604-basebuild-4c-4g' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml index 7dafd1041..9387a7846 100644 --- a/jjb/portal/portal-docker.yaml +++ b/jjb/portal/portal-docker.yaml @@ -19,6 +19,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index dc3ce2438..345773853 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -14,6 +14,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml index e9adf7725..ffd080b62 100644 --- a/jjb/sdnc/sdnc-adaptors.yaml +++ b/jjb/sdnc/sdnc-adaptors.yaml @@ -17,6 +17,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdnc-adaptors-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml index 57ad59b82..4a1e78eee 100644 --- a/jjb/sdnc/sdnc-core.yaml +++ b/jjb/sdnc/sdnc-core.yaml @@ -24,6 +24,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdnc-core-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 11e9686fd..0ade93659 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -17,6 +17,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 3f0e859d7..7b3b0bd56 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -21,6 +21,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml index ea5575243..84c7ec8df 100644 --- a/jjb/sdnc/sdnc-plugins.yaml +++ b/jjb/sdnc/sdnc-plugins.yaml @@ -17,6 +17,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'sdnc-plugins-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml index c4ed177f5..c58f5bfa1 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml @@ -8,7 +8,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-gvnfm-vnflcm-settings' - build-node: ubuntu1604-basebuild-4c-4g + build-node: ubuntu1604-redis-4c-4g subproject: - 'lcm': path: 'lcm' diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml new file mode 100644 index 000000000..834d2a898 --- /dev/null +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -0,0 +1,21 @@ +--- + +- project: + name: vfc-nfvo-catalog + project-name: 'vfc-nfvo-catalog' + project: 'vfc/nfvo/catalog' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-catalog-settings' + subproject: + - 'catalog': + path: '.' + pattern: '**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-redis-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index e1a555446..8c38d48d2 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -9,9 +9,9 @@ branch: 'master'
mvn-settings: 'vfc-nfvo-driver-ems-settings'
subproject:
- - 'ems-driver-boco':
- pom: 'ems/ems/sems/boco/ems-driver/pom.xml'
- pattern: 'ems/ems/sems/boco/ems-driver/**'
+ - 'drv-ems-boco':
+ pom: 'ems/boco/pom.xml'
+ pattern: 'ems/boco/**'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 77e16f973..7fa3c2538 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -6,7 +6,7 @@ stream: - 'master': branch: 'master' - mvn-settings: 'vfc-nfvo-driver-svnfm-huawei-settings' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' subproject: - 'drv-vnfm-huawei': pom: 'huawei/vnfmadapter/pom.xml' diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml new file mode 100644 index 000000000..92f84827c --- /dev/null +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -0,0 +1,23 @@ +--- + +- project: + name: vfc-nfvo-wfengine + project-name: 'vfc-nfvo-wfengine' + project: 'vfc/nfvo/wfengine' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-wfengine-settings' + subproject: + - 'engine-mgr-service': + pom: 'wfenginemgrservice/pom.xml' + pattern: 'wfenginemgrservice/**' + - 'engine-activiti-extension': + pom: 'activiti-extension/pom.xml' + pattern: 'activiti-extension/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 666f5ab41..df9bb7666 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -1,13 +1,28 @@ --- - project: name: vnfsdk-refrepo - project: 'vnfsdk/refrepo' + project-name: 'vnfsdk-refrepo' 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-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + maven-properties: | + skip.docker.build=false + skip.docker.tag=false + skip.docker.push=false - project-name: 'vnfsdk-refrepo' + project: 'vnfsdk/refrepo' stream: - 'master': branch: 'master' mvn-settings: 'vnfsdk-refrepo-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 832340f9f..008402f98 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -13,7 +13,7 @@ rh_systems() { yum install -y openssl-devel mysql-devel gcc # Autorelease support packages - yum install -y xmlstarlet + yum install -y python-tox xmlstarlet # Additional libraries for Python ncclient yum install -y libxml2 libxslt libxslt-devel libffi libffi-devel @@ -47,7 +47,7 @@ ubuntu_systems() { apt-get install -y libssl-dev libmysqlclient-dev gcc # Autorelease support packages - apt-get install -y xmlstarlet + apt-get install -y python-tox xmlstarlet # Additional libraries for Python ncclient apt-get install -y wget unzip python-ncclient diff --git a/packer/provision/docker.sh b/packer/provision/docker.sh index 117c436aa..739ba4293 100644 --- a/packer/provision/docker.sh +++ b/packer/provision/docker.sh @@ -40,7 +40,10 @@ ubuntu_systems() { } all_systems() { - echo 'No common distribution configuration to perform' + # Install docker-compose + curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/1.15.0/docker-compose-$(uname -s)-$(uname -m)" + chmod +x /usr/local/bin/docker-compose + docker-compose -v } echo "---> Detecting OS" |