diff options
| -rw-r--r-- | jjb/csit/csit.yaml | 6 | ||||
| -rw-r--r-- | jjb/deb_dpdk/deb_dpdk.yaml | 6 | ||||
| -rw-r--r-- | jjb/dmm/dmm.yaml | 197 | ||||
| -rw-r--r-- | jjb/dmm/include-raw-dmm-csit-functional-virl.sh | 6 | ||||
| -rw-r--r-- | jjb/dmm/include-raw-dmm-test-checkstyle.sh | 29 | ||||
| -rw-r--r-- | jjb/hc2vpp/hc2vpp.yaml | 3 | ||||
| -rw-r--r-- | jjb/nsh_sfc/nsh_sfc.yaml | 3 | ||||
| -rw-r--r-- | jjb/vpp/vpp-opensuse.yaml | 20 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 19 | ||||
| -rw-r--r-- | packer/templates/basebuild.json | 3 |
10 files changed, 186 insertions, 106 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index 7de5885f9..42f159c4c 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -61,9 +61,6 @@ - master: branch: 'master' branch-id: 'oper' - - '1807': - branch: 'rls1807' - branch-id: 'oper-rls1807' stream: - master: branch: 'master' @@ -1009,8 +1006,7 @@ build-timeout: '{build-timeout}' triggers: - # - timed: '0 2,16 * * *' - - timed: '0 16 * * 1,3,5' + - timed: '0 2,16 * * *' builders: - shell: 'echo "BRANCH_ID={branch-id}" > $WORKSPACE/variables.prop' diff --git a/jjb/deb_dpdk/deb_dpdk.yaml b/jjb/deb_dpdk/deb_dpdk.yaml index 17a15e319..e0d3b452e 100644 --- a/jjb/deb_dpdk/deb_dpdk.yaml +++ b/jjb/deb_dpdk/deb_dpdk.yaml @@ -28,6 +28,12 @@ - 1802: branch: '18.02.x' repo-stream-part: 'deb_dpdk_1802' + - 1805: + branch: '18.05.x' + repo-stream-part: 'deb_dpdk_1805' + - 1808: + branch: '18.08.x' + repo-stream-part: 'deb_dpdk_1808' - job-template: name: 'deb_dpdk-verify-{stream}-{os}' diff --git a/jjb/dmm/dmm.yaml b/jjb/dmm/dmm.yaml index 0a29ccbd7..3a94a13a2 100644 --- a/jjb/dmm/dmm.yaml +++ b/jjb/dmm/dmm.yaml @@ -1,3 +1,4 @@ +--- ######################################################################### # # Copyright (c) 2018 Huawei Technologies Co.,Ltd. @@ -17,16 +18,61 @@ - project: name: dmm jobs: - - 'dmm-verify-{stream}-{os}' - - 'dmm-merge-{stream}-{os}' - - 'dmm-csit-verify-func-{stream}-{os}-virl' + - 'dmm-verify-{stream}-checkstyle' + - 'dmm-verify-{stream}-{os}' + - 'dmm-merge-{stream}-{os}' + - 'dmm-csit-verify-func-{stream}-{os}-virl' project: 'dmm' - os: - - ubuntu1604 + os: 'ubuntu1604' + stream: - - master: - branch: 'master' + - master: + branch: 'master' + +- job-template: + name: 'dmm-verify-{stream}-checkstyle' + + 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-dmm-test-checkstyle.sh + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' - job-template: name: 'dmm-verify-{stream}-{os}' @@ -36,37 +82,37 @@ 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}' + 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}' + - 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' + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-submitted: - name: 'dmm' - branch: '{branch}' + - gerrit-trigger-patch-submitted: + name: 'dmm' + branch: '{branch}' builders: - - shell: - !include-raw-escape: include-raw-build.sh + - shell: + !include-raw-escape: include-raw-build.sh publishers: - fdio-infra-shiplogs: @@ -79,37 +125,37 @@ 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}' + 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}' + - 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' + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-patch-merged: - name: 'dmm' - branch: '{branch}' + - gerrit-trigger-patch-merged: + name: 'dmm' + branch: '{branch}' builders: - - shell: - !include-raw-escape: include-raw-build.sh + - shell: + !include-raw-escape: include-raw-build.sh publishers: - fdio-infra-shiplogs: @@ -123,44 +169,43 @@ 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}' + 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}' + - project-parameter: + project: 'dmm' + - gerrit-parameter: + branch: '{branch}' scm: - - gerrit-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-manually-triggered: - name: 'dmm' - branch: '{branch}' - comment-trigger-value: 'verify-dmm-func' + - gerrit-trigger-patch-submitted: + name: 'dmm' + branch: '{branch}' builders: - - shell: - !include-raw-escape: include-raw-dmm-csit-functional-virl.sh + - 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 + - archive-artifacts: + artifacts: 'csit/report.html, csit/log.html, csit/output.xml' + latest-only: false - - robot-report: - output-path: 'csit' + - robot-report: + output-path: 'csit' - - fdio-infra-shiplogs: - maven-version: 'mvn33-new' + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' diff --git a/jjb/dmm/include-raw-dmm-csit-functional-virl.sh b/jjb/dmm/include-raw-dmm-csit-functional-virl.sh index 5571bd574..715601a21 100644 --- a/jjb/dmm/include-raw-dmm-csit-functional-virl.sh +++ b/jjb/dmm/include-raw-dmm-csit-functional-virl.sh @@ -14,8 +14,6 @@ set -xeu -o pipefail -cd ../ - # Clone csit and start tests git clone https://gerrit.fd.io/r/csit @@ -25,8 +23,10 @@ if [ $? != 0 ]; then exit 1 fi +mkdir -p ./csit/dmm/ + # Move the dmm to the csit dir -sudo mv -f ./dmm/ ./csit/ +rsync -av --progress --exclude="csit" . ./csit/dmm/ cd csit diff --git a/jjb/dmm/include-raw-dmm-test-checkstyle.sh b/jjb/dmm/include-raw-dmm-test-checkstyle.sh new file mode 100644 index 000000000..90b307141 --- /dev/null +++ b/jjb/dmm/include-raw-dmm-test-checkstyle.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# 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. + +if grep 'checkstyle' CMakeLists.txt > /dev/null +then + cd build/ + cmake .. + make checkstyle + if [ $? -eq 0 ]; then + echo "DMM checkstyle is SUCCESS" + else + echo "DMM checkstyle has FAILED" + exit 1 + fi +else + echo "Can't find checkstyle target in CMakeLists.txt- skipping test checkstyle" + exit 1 +fi
\ No newline at end of file diff --git a/jjb/hc2vpp/hc2vpp.yaml b/jjb/hc2vpp/hc2vpp.yaml index e1d35914c..adc9fab5f 100644 --- a/jjb/hc2vpp/hc2vpp.yaml +++ b/jjb/hc2vpp/hc2vpp.yaml @@ -287,6 +287,9 @@ !include-raw-escape: - ../scripts/maven_push_functions.sh - include-raw-hc2vpp-pkg-push.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh reporters: - findbugs diff --git a/jjb/nsh_sfc/nsh_sfc.yaml b/jjb/nsh_sfc/nsh_sfc.yaml index a23d0959d..8ac1b9dce 100644 --- a/jjb/nsh_sfc/nsh_sfc.yaml +++ b/jjb/nsh_sfc/nsh_sfc.yaml @@ -355,6 +355,9 @@ - ../scripts/cleanup_vpp_plugin_dev_env.sh - ../scripts/maven_push_functions.sh - include-raw-nsh_sfc-pkg-push.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh publishers: - fdio-infra-shiplogs: diff --git a/jjb/vpp/vpp-opensuse.yaml b/jjb/vpp/vpp-opensuse.yaml index ad4fb718d..14c0c0b88 100644 --- a/jjb/vpp/vpp-opensuse.yaml +++ b/jjb/vpp/vpp-opensuse.yaml @@ -129,22 +129,10 @@ build-timeout: '{build-timeout}' triggers: - - gerrit: - server-name: 'Primary' - trigger-on: - - comment-added-contains-event: - comment-contains-value: 'checkstyle_success' - projects: - - project-compare-type: 'ANT' - project-pattern: '{name}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true + - gerrit-trigger-checkstyle-nonvoting: + name: '{project}' + branch: '{branch}' + branch-pattern: '**/{branch}' builders: - shell: diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 374a7e6c5..3221c610e 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -291,7 +291,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-checkstyle-nonvoting: + - gerrit-trigger-checkstyle: name: '{project}' branch: '{branch}' @@ -444,6 +444,8 @@ - comment-added-contains-event: comment-contains-value: 'checkstylecheck' - comment-added-contains-event: + comment-contains-value: 'docsonly' + - comment-added-contains-event: comment-contains-value: 'recheck' - comment-added-contains-event: comment-contains-value: 'reverify' @@ -453,6 +455,15 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + file-paths: + - compare-type: REG_EXP + pattern: ^((?!\/COMMIT_MSG|docs|_abc|_def[\/\.]).)*$ + forbidden-file-paths: + - compare-type: REG_EXP + pattern: .*docs\/.* + - compare-type: REG_EXP + pattern: .*extras\/emacs\/.* + disable-strict-forbidden-file-verification: 'true' override-votes: true gerrit-build-notbuilt-verified-value: 0 gerrit-build-successful-verified-value: 1 @@ -727,7 +738,7 @@ build-timeout: '{build-timeout}' triggers: - - gerrit-trigger-checkstyle: + - gerrit-trigger-checkstyle-nonvoting: name: '{project}' branch: '{branch}' @@ -850,7 +861,7 @@ project-type: freestyle node: ubuntu1604-us - concurrent: true + concurrent: false logrotate: daysToKeep: '{build-days-to-keep}' @@ -1145,5 +1156,3 @@ rerun-unstable-builds: false max-failed-builds: 1 fixed-delay: 90 - - diff --git a/packer/templates/basebuild.json b/packer/templates/basebuild.json index 426f290af..bcb6f0ae7 100644 --- a/packer/templates/basebuild.json +++ b/packer/templates/basebuild.json @@ -19,7 +19,8 @@ "password": "{{user `stack_pass`}}", "region": "ca-ymq-1", "ssh_username": "{{user `cloud_user`}}", - "image_name": "{{user `distro`}} - basebuild - {{isotime \"20060102-1504\"}}", + "image_name": "{{user `distro`}} - basebuild - {{isotime \"20060102-150405.000\"}}", + "instance_name": "{{user `distro`}}-basebuild-{{uuid}}", "source_image_name": "{{user `base_image`}}", "flavor": "v1-standard-1", "availability_zone": "ca-ymq-2", |