diff options
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-heartbeat.yaml | 21 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-utils.yaml | 20 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller-docker.yaml | 22 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller.yaml | 8 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 8 | ||||
| -rw-r--r-- | jjb/onap-jjb/onap-pypi-template.yaml | 194 | ||||
| -rw-r--r-- | jjb/optf/build-optf-has-docker-image.sh | 4 | ||||
| -rw-r--r-- | jjb/policy/policy-common.yaml | 3 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 3 | ||||
| -rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 5 | ||||
| -rw-r--r-- | jjb/policy/policy-engine.yaml | 5 | ||||
| -rwxr-xr-x | jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh | 8 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-ice-python.yaml | 11 | ||||
| -rw-r--r-- | shell/pypi-dist-build.sh | 11 | ||||
| -rw-r--r-- | shell/pypi-get.sh | 15 | ||||
| -rw-r--r-- | shell/pypi-publish.sh | 11 |
16 files changed, 303 insertions, 46 deletions
diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index e3d8fbaf7..295ce274f 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -4,11 +4,32 @@ project-name: 'dcaegen2-services-heartbeat' jobs: - gerrit-maven-clm + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + project: 'dcaegen2/services/heartbeat' stream: - 'master': branch: 'master' mvn-settings: 'dcaegen2-services-heartbeat-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' +- project: + name: dcaegen2-services-heartbeat-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-4c-4g + project: 'dcaegen2/services/heartbeat' + project-name: 'dcaegen2-services-heartbeat' + branch: 'master' + mvn-settings: 'dcaegen2-services-heartbeat-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index f91a4c211..d6dcb0168 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -2,11 +2,31 @@ - project: name: dcaegen2-utils project-name: 'dcaegen2-utils' + python-version: python3 + subproject: + - 'dcaeapplib': + tox-dir: dcaeapplib/ + tox-envs: '' + - 'onap-dcae-dbs-docker-client': + tox-dir: onap-dcae-dbs-docker-client/ + tox-envs: '' + - 'onap-dcae-dcaepolicy-lib': + tox-dir: onap-dcae-dcaepolicy-lib/ + tox-envs: '' + - 'python-discovery-client': + tox-dir: python-discovery-client/ + tox-envs: '' + - 'python-dockering': + tox-dir: python-dockering/ + tox-envs: '' + jobs: - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{subproject}-python-staging-{stream}' + - '{project-name}-{subproject}-python-release-{stream}' project: 'dcaegen2/utils' stream: diff --git a/jjb/dmaap/dmaap-buscontroller-docker.yaml b/jjb/dmaap/dmaap-buscontroller-docker.yaml deleted file mode 100644 index a862a19bf..000000000 --- a/jjb/dmaap/dmaap-buscontroller-docker.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- - -- project: - name: dmaap-buscontroller-docker - project-name: 'dmaap-buscontroller-docker' - jobs: - - gerrit-maven-clm: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily' - - '{project-name}-{stream}-docker-version-java-daily' - project: 'dmaap/buscontroller' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dmaap-buscontroller-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 591b88649..d06314e16 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -1,4 +1,5 @@ --- + - project: name: dmaap-buscontroller project-name: 'dmaap-buscontroller' @@ -10,7 +11,12 @@ - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' - mvn-goals: 'clean install' + mvn-goals: 'clean install docker:build' + - '{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 project: 'dmaap/buscontroller' stream: - 'master': diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 826b6041d..85c275644 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -66,6 +66,14 @@ builders: - shell: !include-raw: include-docker-login.sh +- builder: + name: publish-pypi + builders: + - inject: + properties-content: PYPI_SERVER={pypi-server} + - shell: + !include-raw-escape: ../shell/pypi-publish.sh + # PARAMETERS - parameter: name: infra-parameters diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml new file mode 100644 index 000000000..bfd709905 --- /dev/null +++ b/jjb/onap-jjb/onap-pypi-template.yaml @@ -0,0 +1,194 @@ +--- +# Job definition Anchors +- pypi_job_boiler_plate: &pypi_job_boiler_plate + name: pypi_job_boiler_plate + + ##################### + # Job Variables # + ##################### + + gerrit_merge_triggers: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: pypi-remerge$ + + gerrit_release_trigger: + - comment-added-contains-event: + comment-contains-value: pypi-release$ + + gerrit_trigger_file_paths: + - compare-type: ANT + pattern: '**' + + ##################### + # Job Configuration # + ##################### + + project-type: freestyle + node: '{build-node}' + + parameters: + - lf-infra-parameters: + project: '{project}' + branch: '{branch}' + stream: '{stream}' + lftools-version: '{lftools-version}' + - lf-infra-tox-parameters: + tox-dir: '{tox-dir}' + tox-envs: '{tox-envs}' + + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '$GIT_URL/$PROJECT' + refspec: '$GERRIT_REFSPEC' + branch: '$GERRIT_BRANCH' + submodule-recursive: true + choosing-strategy: default + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + publishers: + - lf-infra-publish + +- job-template: + name: '{project-name}-python-staging-{stream}' + + # Job template for PyPI staging jobs + # Daily Builds + + <<: *pypi_job_boiler_plate + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_merge_triggers}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + + builders: + - lf-infra-tox-install: + python-version: '{python-version}' + - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh + - config-file-provider: + files: + - file-id: pypirc + target: '$HOME/.pypirc' + - shell: + !include-raw-escape: ../shell/pypi-dist-build.sh + + - publish-pypi: + pypi-server: staging + +- job-template: + name: '{project-name}-python-release-{stream}' + + # Job template for PyPI release jobs + + <<: *pypi_job_boiler_plate + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_release_trigger}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + + builders: + - lf-infra-tox-install: + python-version: '{python-version}' + - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh + - config-file-provider: + files: + - file-id: pypirc + target: '$HOME/.pypirc' + - shell: + !include-raw-escape: ../shell/pypi-dist-build.sh + + - publish-pypi: + pypi-server: release + +- job-template: + name: '{project-name}-{subproject}-python-staging-{stream}' + + # Job template for PyPI staging jobs + # Daily Builds + + <<: *pypi_job_boiler_plate + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_merge_triggers}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + + builders: + - lf-infra-tox-install: + python-version: '{python-version}' + - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh + - config-file-provider: + files: + - file-id: pypirc + target: '$HOME/.pypirc' + - shell: + !include-raw-escape: ../shell/pypi-dist-build.sh + + - publish-pypi: + pypi-server: staging + +- job-template: + name: '{project-name}-{subproject}-python-release-{stream}' + + # Job template for PyPI release jobs + + <<: *pypi_job_boiler_plate + + triggers: + - gerrit: + server-name: '{gerrit-server-name}' + trigger-on: '{obj:gerrit_release_trigger}' + projects: + - project-compare-type: ANT + project-pattern: '{project}' + branches: + - branch-compare-type: ANT + branch-pattern: '**/{branch}' + file-paths: '{obj:gerrit_trigger_file_paths}' + + builders: + - lf-infra-tox-install: + python-version: '{python-version}' + - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh + - config-file-provider: + files: + - file-id: pypirc + target: '$HOME/.pypirc' + - shell: + !include-raw-escape: ../shell/pypi-dist-build.sh + + - publish-pypi: + pypi-server: release diff --git a/jjb/optf/build-optf-has-docker-image.sh b/jjb/optf/build-optf-has-docker-image.sh index d1405f4d2..6c93c8b9d 100644 --- a/jjb/optf/build-optf-has-docker-image.sh +++ b/jjb/optf/build-optf-has-docker-image.sh @@ -5,6 +5,6 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./conductor/docker/*.* +chmod 755 ./*.* -./conductor/docker/build-dockers.sh +./build-dockers.sh diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index e664f6e81..fb760424c 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -7,9 +7,6 @@ - '{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: 'policy/common' stream: diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index bdbfd497d..ccf078eed 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -8,9 +8,6 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': disabled: true - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'policy/drools-applications' stream: diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 920e1eb8d..3fc8f576e 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -6,11 +6,6 @@ - gerrit-maven-clm: mvn-params: '-DskipTests' - '{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}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index e379e4b04..a8a9a1766 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -6,11 +6,6 @@ - gerrit-maven-clm: build-timeout: 30 - '{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}-merge-scm-mvn-script': mvn-goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' diff --git a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index 36a76a916..d729cb1bd 100755 --- a/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -5,15 +5,19 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR +echo '============== BUILDING ZTE IMAGE =================' chmod 755 ./zte/vmanager/docker/*.* ./zte/vmanager/docker/build_image.sh +echo '============== BUILDING HUAWEI IMAGE =================' chmod 755 ./huawei/vnfmadapter/VnfmadapterService/docker/*.* ./huawei/vnfmadapter/VnfmadapterService/docker/build_image.sh +echo '============== BUILDING NOKIA V1 IMAGE =================' chmod 755 ./nokia/vnfmdriver/vfcadaptorservice/docker/*.* ./nokia/vnfmdriver/vfcadaptorservice/docker/build_image.sh -cd nokiav2/deployment -mvn package -Dexec.args="buildDocker pushImage" +echo '============== BUILDING NOKIA V2 IMAGE =================' +chmod 755 ./nokiav2/deployment/src/main/resources/*.sh +./nokiav2/deployment/src/main/resources/build_image.sh buildDocker pushImage diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index 4ef86a070..f8eb21393 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -8,9 +8,14 @@ - 'master': branch: 'master' subproject: - - ice: - path: '.' - pattern: '**' + - 'scripts': + path: 'validation-scripts' + pattern: 'validation-scripts/**' + pom: 'validation-scripts/pom.xml' + - 'server': + path: 'ice-server' + pattern: 'ice-server/**' + pom: 'ice-server/pom.xml' mvn-settings: 'vnfsdk-ice-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: diff --git a/shell/pypi-dist-build.sh b/shell/pypi-dist-build.sh new file mode 100644 index 000000000..7733f6242 --- /dev/null +++ b/shell/pypi-dist-build.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Script to build PyPI artifacts +set -e -x -o pipefail + +virtualenv /tmp/v/twine +source "/tmp/v/twine/bin/activate" + +pip install twine wheel + +cd "$WORKSPACE/$TOX_DIR" +python setup.py sdist bdist_wheel diff --git a/shell/pypi-get.sh b/shell/pypi-get.sh new file mode 100644 index 000000000..40900a5d7 --- /dev/null +++ b/shell/pypi-get.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# Script to download PyPI artifacts + +PROJECT_NAME=$(grep name= setup.py | cut -d"'" -f2) +ARTIFACT_VERSION=$(grep __version__ ${PROJECT_NAME}/_version.py | cut -d'"' -f2) +REPO_URL="https://nexus3.onap.org/repository/PyPi.staging/packages" +TAR_NAME="$REPO_URL/$PROJECT_NAME/$ARTIFACT_VERSION/$PROJECT_NAME-$ARTIFACT_VERSION.tar.gz" +WHEEL_NAME="${REPO_URL}/${PROJECT_NAME}/${ARTIFACT_VERSION}/${PROJECT_NAME}-${ARTIFACT_VERSION}-py2-none-any.whl" + +mkdir dist +cd dist + +wget ${TAR_NAME} +wget ${WHEEL_NAME} diff --git a/shell/pypi-publish.sh b/shell/pypi-publish.sh new file mode 100644 index 000000000..7ea3fa2d9 --- /dev/null +++ b/shell/pypi-publish.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# Script to publush PyPI artifacts +set -e -x -o pipefail + +virtualenv /tmp/v/twine +source "/tmp/v/twine/bin/activate" + +pip install twine + +cd "$WORKSPACE/$TOX_DIR" +twine upload -r $PYPI_SERVER dist/* |