diff options
22 files changed, 207 insertions, 60 deletions
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 2ca84f1a8..f62c8d775 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'aai-model-loader-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index acd147baa..03e0245d5 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -5,6 +5,7 @@ jobs: - gerrit-maven-clm: java-version: '' + build-timeout: 60 - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/global-jjb b/jjb/global-jjb -Subproject c38dce2088f0833b94b8811bbd1efc3e74e8b06 +Subproject cda2ec16956502d39e9cffb1843987c03aca8c0 diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index e31a470df..c8d566500 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1616,6 +1616,79 @@ maven-version: '{maven-version}' - job-template: + name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + + 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: '' + 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}' + + - inject: + properties-file: version.properties + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: 'versions:set versions:update-child-modules versions:commit -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - docker-login + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: '{mvn-goals}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - shell: '{script}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: name: '{project-name}-{stream}-docker-version-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' @@ -1684,6 +1757,76 @@ maven-version: '{maven-version}' - job-template: + name: '{project-name}-{stream}-{subproject}-docker-version-java-daily' + project-type: freestyle + node: 'ubuntu1604-docker-8c-8g' + + 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: '' + 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}' + + - inject: + properties-file: version.properties + + - maven-target: + maven-version: '{maven-version}' + pom: '{pom}' + goals: 'versions:set versions:update-child-modules versions:commit -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + + - docker-login + + - maven-docker-push-daily: + maven-version: '{maven-version}' + pom: '{pom}' + mvn-settings: '{mvn-settings}' + pom: '{docker-pom}' + # use default as mvn-profile if profile is not needed + mvn-profile: '{mvn-profile}' + + publishers: + - infra-shiplogs: + maven-version: '{maven-version}' + +- job-template: name: '{project-name}-{stream}-aai-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' @@ -2146,7 +2289,7 @@ - maven-target: maven-version: '{maven-version}' pom: '{site-pom}' - goals: 'clean site:site site:stage-deploy' + goals: 'clean site:site site:stage-deploy -B' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index c2da1cd9e..991ffd69a 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -752,14 +752,14 @@ # vim: sw=2 ts=2 sts=2 et : - job-template: - # Job template for scm and script trigger - for docker merge + # Job template for two scm and script trigger - for docker merge # # Required Variables: # branch: git branch # build-node: what build node to run on # script: build script to execute - name: '{project-name}-{stream}-merge-docker-script' + name: '{project-name}-{stream}-two-scm-merge-docker-script' project-type: freestyle concurrent: true @@ -784,15 +784,10 @@ choosing-strategy: 'default' submodule-recursive: '{submodule-recursive}' - git-extra-project: - project: '{extra-project1}' - refspec: '{extra-refspec1}' - branch: '{extra-branch1}' - checkout-dir: '{checkout-dir1}' - - git-extra-project: - project: '{extra-project2}' - refspec: '{extra-refspec2}' - branch: '{extra-branch2}' - checkout-dir: '{checkout-dir2}' + project: '{extra-project}' + refspec: '{extra-refspec}' + branch: '{extra-branch}' + checkout-dir: '{checkout-dir}' wrappers: - infra-wrappers: @@ -825,14 +820,14 @@ maven-version: '{maven-version}' - job-template: - # Job template for scm and script trigger - for docker daily release + # Job template for two scm and script trigger - for docker daily release # # Required Variables: # branch: git branch # build-node: what build node to run on # script: build script to execute - name: '{project-name}-{stream}-release-docker-script-manual' + name: '{project-name}-{stream}-two-scm-release-docker-script-manual' project-type: freestyle concurrent: true @@ -857,15 +852,10 @@ choosing-strategy: 'default' submodule-recursive: '{submodule-recursive}' - git-extra-project: - project: '{extra-project1}' - refspec: '{extra-refspec1}' - branch: '{extra-branch1}' - checkout-dir: '{checkout-dir1}' - - git-extra-project: - project: '{extra-project2}' - refspec: '{extra-refspec2}' - branch: '{extra-branch2}' - checkout-dir: '{checkout-dir2}' + project: '{extra-project}' + refspec: '{extra-refspec}' + branch: '{extra-branch}' + checkout-dir: '{checkout-dir}' wrappers: - infra-wrappers: diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml index 09479fa6a..b40bd84b1 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml @@ -10,6 +10,6 @@ functionality: - 'APIs': trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + - '{project-name}-{stream}-release-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml index 0c7315c21..5205d2c3c 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml @@ -19,7 +19,7 @@ - '{project-name}-{stream}-{subproject}-release-java-daily' - '{project-name}-{stream}-docker-java-properties-daily': setVersion: 'DontSetVersion' - docker-pom: 'pom.xml' + docker-pom: 'javatoscachecker/pom.xml' mvn-profile: 'docker' maven-properties: | skip.docker.build=false diff --git a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml index 099e22749..f7c03ea89 100644 --- a/jjb/modeling/modeling-toscaparsers-nfvparser.yaml +++ b/jjb/modeling/modeling-toscaparsers-nfvparser.yaml @@ -18,6 +18,7 @@ - '{project-name}-{stream}-{subproject}-verify-python' - gerrit-maven-clm: java-version: '' + mvn-params: '-f nfvparser/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml index 5e141a905..1d4fa6b33 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml @@ -14,7 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/oom/oneclick-config-build-docker-image.sh b/jjb/oom/oneclick-config-build-docker-image.sh index 2cee98fbc..a0d7168f1 100644 --- a/jjb/oom/oneclick-config-build-docker-image.sh +++ b/jjb/oom/oneclick-config-build-docker-image.sh @@ -9,4 +9,4 @@ cd kubernetes/config/docker/init chmod 755 *.* -docker build +docker build . diff --git a/jjb/oom/oneclick-config-make-tar.sh b/jjb/oom/oneclick-config-make-tar.sh index da2da2000..0f63e0962 100644 --- a/jjb/oom/oneclick-config-make-tar.sh +++ b/jjb/oom/oneclick-config-make-tar.sh @@ -9,4 +9,5 @@ cd kubernetes/config/docker/init chmod 755 *.* -./make-tar.sh +cd src/config +tar -czvf ../../onap-cfg.tar.gz * diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 9d99ae12d..7dce80e3c 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -5,6 +5,7 @@ jobs: - gerrit-maven-clm: java-version: '' + mvn-params: '-DskipTests' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index bb2e3a482..30e3ba391 100644 --- a/jjb/portal/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -21,8 +21,6 @@ stream: - 'master': branch: 'master' - - 'release-1.3.0': - branch: 'release-1.3.0' - 'release-1.3.1': branch: 'release-1.3.1' mvn-settings: 'portal-sdk-settings' diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml index 712e490e2..71edff8d7 100644 --- a/jjb/portal/portal-docker.yaml +++ b/jjb/portal/portal-docker.yaml @@ -4,28 +4,26 @@ name: portal-docker project-name: 'portal-docker' jobs: - - '{project-name}-{stream}-three-scm-verify-script': + - '{project-name}-{stream}-two-scm-verify-script': script: !include-raw-escape: 'docker-build-deploy.sh' - - '{project-name}-{stream}-merge-docker-script': + - '{project-name}-{stream}-two-scm-merge-docker-script': script: !include-raw-escape: 'docker-build-push.sh' - - '{project-name}-{stream}-release-docker-script-manual': + - '{project-name}-{stream}-two-scm-release-docker-script-manual': script: !include-raw-escape: 'docker-build-release.sh' project: 'portal' stream: - 'master': branch: 'master' + - 'release-1.3.0': + branch: 'release-1.3.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' build-node: ubuntu1604-docker-8c-8g - extra-project1: 'portal/sdk' - extra-branch1: '{branch}' - extra-refspec1: 'refs/heads/{branch}' - checkout-dir1: 'sdk' - extra-project2: 'ui/dmaapbc' - extra-branch2: '{branch}' - extra-refspec2: 'refs/heads/{branch}' - checkout-dir2: 'dmaapbc' + extra-project: 'portal/sdk' + extra-branch: '{branch}' + extra-refspec: 'refs/heads/{branch}' + checkout-dir: 'sdk' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index ef05814cc..e16aa1aa3 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -3,14 +3,16 @@ name: portal project-name: 'portal' jobs: - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-release-java-daily' - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' + trigger-job: '{project-name}-{stream}-release-java-daily' project: 'portal' stream: - 'master': branch: 'master' + - 'release-1.3.0': + branch: 'release-1.3.0' mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 196c2938e..69cfe9dc7 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -5,10 +5,17 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'sdc' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'release-1.1.0': + branch: 'release-1.1.0' functionality: - 'sanity': trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + - '{project-name}-{stream}-sdc-merge-java' + - 'nightly': + trigger_jobs: + - '{project-name}-{stream}-docker-version-java-daily' robot-options: '' branch: 'master' diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml index 805938659..9f7d0f785 100644 --- a/jjb/ui/ui-dmaapbc.yaml +++ b/jjb/ui/ui-dmaapbc.yaml @@ -17,8 +17,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' - 'release-1.1.0': branch: 'release-1.1.0' mvn-settings: 'ui-dmaapbc-settings' diff --git a/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh new file mode 100644 index 000000000..495220f26 --- /dev/null +++ b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./activiti-extension/src/main/docker/*.sh +./activiti-extension/src/main/docker/activiti-docker-build_image.sh + diff --git a/jjb/vfc/build-nfvo-wfengine-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh index de7d13bd1..3a27413df 100644 --- a/jjb/vfc/build-nfvo-wfengine-docker-image.sh +++ b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh @@ -5,9 +5,6 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./activiti-extension/src/main/docker/*.sh -./activiti-extension/src/main/docker/activiti-docker-build_image.sh - chmod 755 ./wfenginemgrservice/src/main/docker/*.sh ./wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh diff --git a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml index 91bad74ab..b23a90d7b 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-csit.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-csit.yaml @@ -9,6 +9,7 @@ functionality: - 'sanity-check': trigger_jobs: - - 'vfc-nfvo-wfengine-master-docker-java-version-shell-daily' + - 'vfc-nfvo-wfengine-master-engine-activiti-extension-docker-java-version-shell-daily' + - 'vfc-nfvo-wfengine-master-engine-mgr-service-docker-java-version-shell-daily' robot-options: '' branch: 'master'
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 8759a56d0..570909b64 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -12,18 +12,19 @@ - 'engine-mgr-service': pom: 'wfenginemgrservice/pom.xml' pattern: 'wfenginemgrservice/**' + script: + !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh' - 'engine-activiti-extension': pom: 'activiti-extension/pom.xml' pattern: 'activiti-extension/**' + script: + !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-nfvo-wfengine-docker-image.sh' + - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': + mvn-goals: 'clean' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 9e20664a5..aba8b19ce 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 firefox python-tox xmlstarlet xvfb crudini + yum install -y firefox python-tox xmlstarlet xvfb crudini maven # Install chrome to support ChromeDriver cat << EOF > /etc/yum.repos.d/google-chrome.repo @@ -65,7 +65,7 @@ ubuntu_systems() { apt-get install -y libssl-dev libmysqlclient-dev gcc # Autorelease support packages - apt-get install -y firefox python-tox xmlstarlet xvfb crudini + apt-get install -y firefox python-tox xmlstarlet xvfb crudini maven # Install chrome to support ChromeDriver wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - |