diff options
| -rw-r--r-- | jjb/dmm/dmm.yaml | 166 | ||||
| -rwxr-xr-x | jjb/dmm/include-raw-build.sh | 17 | ||||
| -rw-r--r-- | jjb/dmm/include-raw-dmm-csit-functional-virl.sh | 55 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 22 |
4 files changed, 249 insertions, 11 deletions
diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml new file mode 100644 index 000000000..75dae6fc0 --- /dev/null +++ b/jjb/dmm/dmm.yaml @@ -0,0 +1,166 @@ +######################################################################### +# +# Copyright (c) 2018 Huawei Technologies Co.,Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +######################################################################### + +- project: + name: dmm + jobs: + - 'dmm-verify-{stream}-{os}' + - 'dmm-merge-{stream}-{os}' + - 'dmm-csit-verify-func-{stream}-{os}-virl' + + project: 'dmm' + os: + - ubuntu1404 + stream: + - master: + branch: 'master' + +- job-template: + name: 'dmm-verify-{stream}-{os}' + + project-type: freestyle + node: '{os}-basebuild-4c-4g' + concurrent: true + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: 'dmm' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + name: 'dmm' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: include-raw-build.sh + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'dmm-merge-{stream}-{os}' + + project-type: freestyle + node: '{os}-basebuild-4c-4g' + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: 'dmm' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: '{os}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-merged: + name: 'dmm' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: include-raw-build.sh + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'dmm-csit-verify-func-{stream}-{os}-virl' + + project-type: freestyle + node: '{os}-basebuild-4c-4g' + concurrent: true + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: 'dmm' + - gerrit-parameter: + branch: '{branch}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-manually-triggered: + name: 'dmm' + branch: '{branch}' + comment-trigger-value: 'verify-dmm-func' + + builders: + - shell: + !include-raw-escape: include-raw-dmm-csit-functional-virl.sh + + publishers: + - archive-artifacts: + artifacts: 'csit/report.html, csit/log.html, csit/output.xml' + latest-only: false + + - robot-report: + output-path: '' + + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' diff --git a/jjb/dmm/include-raw-build.sh b/jjb/dmm/include-raw-build.sh new file mode 100755 index 000000000..b353c0660 --- /dev/null +++ b/jjb/dmm/include-raw-build.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# basic build script example +set -e -o pipefail + +# Make DMM +./scripts/build.sh + +echo "*******************************************************************" +echo "* DMM BUILD SUCCESSFULLY COMPLETED" +echo "*******************************************************************" + +# Run unit tests application +#need to be added + +#echo "*******************************************************************" +#echo "* DMM UNIT TESTS SUCCESSFUL" +#echo "*******************************************************************" diff --git a/jjb/dmm/include-raw-dmm-csit-functional-virl.sh b/jjb/dmm/include-raw-dmm-csit-functional-virl.sh new file mode 100644 index 000000000..1e28e1000 --- /dev/null +++ b/jjb/dmm/include-raw-dmm-csit-functional-virl.sh @@ -0,0 +1,55 @@ +######################################################################### +# +# Copyright (c) 2018 Huawei Technologies Co.,Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at: +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +######################################################################### +#!/bin/bash + +set -xeu -o pipefail + +# Clone dmm and start tests +git clone https://gerrit.fd.io/r/dmm + +# If the git clone fails, complain clearly and exit +if [ $? != 0 ]; then + echo "Failed to run: git clone https://gerrit.fd.io/r/dmm" + exit 1 +fi + +# Clone csit and start tests +git clone https://gerrit.fd.io/r/csit + +# If the git clone fails, complain clearly and exit +if [ $? != 0 ]; then + echo "Failed to run: git clone https://gerrit.fd.io/r/csit" + exit 1 +fi + +# Move the dmm to the csit dir +sudo mv -f ./dmm/ ./csit/ + +cd csit + +# execute dmm bootstrap script if it exists +if [ -e bootstrap-DMM.sh ] +then + # make sure that bootstrap-DMM.sh is executable + chmod +x bootstrap-DMM.sh + # run the script + ./bootstrap-DMM.sh +else + echo 'ERROR: No bootstrap-DMM.sh found' + exit 1 +fi + +# vim: ts=4 ts=4 sts=4 et : diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 5c7a6e3c3..f433ed032 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -187,7 +187,7 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -247,7 +247,7 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -337,7 +337,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -473,7 +473,7 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 2 fixed-delay: 90 @@ -527,7 +527,7 @@ maven-version: 'mvn33-new' archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -680,7 +680,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -844,7 +844,7 @@ maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -1083,7 +1083,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -1166,7 +1166,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -1234,7 +1234,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 @@ -1317,7 +1317,7 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' - naginator: - rerun-unstable-builds: true + rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 |