From e1d4351f54b649ee9ad94d5b72934362c8a31413 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Mon, 16 Oct 2017 15:44:00 +0800 Subject: [PATCH] fix yamllint verify fail fail record: https://build.opnfv.org/ci/job/opnfv-yamllint-verify-master/1050/console Change-Id: Ic709b9a3d1d3642a3deebd930714a2ba2de22da6 Signed-off-by: SerenaFeng --- jjb-sandbox/releng/releng-sandbox-jobs.yml | 80 +++++++++++----------- utils/test/reporting/reporting/reporting.yaml | 2 + .../assets/lib/angular-confirm-modal/.travis.yml | 3 +- .../assets/lib/bootstrap/grunt/sauce_browsers.yml | 1 + 4 files changed, 46 insertions(+), 40 deletions(-) diff --git a/jjb-sandbox/releng/releng-sandbox-jobs.yml b/jjb-sandbox/releng/releng-sandbox-jobs.yml index f5aab1ac2..df8b1d56a 100644 --- a/jjb-sandbox/releng/releng-sandbox-jobs.yml +++ b/jjb-sandbox/releng/releng-sandbox-jobs.yml @@ -1,7 +1,8 @@ +--- - project: name: 'releng-sandbox-jobs' jobs: - - 'releng-deploy-sandbox' + - 'releng-deploy-sandbox' project: 'releng' node: 'releng-sandbox' @@ -11,49 +12,50 @@ node: '{node}' parameters: - - project-parameter: - project: '{project}' - branch: 'master' + - project-parameter: + project: '{project}' + branch: 'master' scm: - - git-scm-gerrit + - git-scm-gerrit triggers: - - gerrit: - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'redeploy' - custom-url: '$BUILD_URL deploying to $JENKINS_URL' - silent-start: true - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - projects: - - project-compare-type: 'ANT' - project-pattern: 'releng' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - file-paths: - - compare-type: ANT - pattern: jjb-sandbox/** + - gerrit: + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'redeploy' + custom-url: '$BUILD_URL deploying to $JENKINS_URL' + silent-start: true + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + projects: + - project-compare-type: 'ANT' + project-pattern: 'releng' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/master' + file-paths: + - compare-type: ANT + pattern: jjb-sandbox/** wrappers: '' builders: - - shell: - !include-raw-escape: verify-sandbox-jobs.sh - - shell: | - #!/bin/bash - jenkins-jobs update --delete-old -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox - + - shell: + !include-raw-escape: verify-sandbox-jobs.sh + # yamllint disable rule:line-length + - shell: | + #!/bin/bash + jenkins-jobs update --delete-old -r jjb/releng-defaults.yaml:jjb/releng-macros.yaml:jjb/opnfv/installer-params.yml:jjb/opnfv/slave-params.yml:jjb-sandbox + # yamllint enable publishers: - - archive-artifacts: - artifacts: 'job_output/*' - - email-jenkins-admins-on-failure + - archive-artifacts: + artifacts: 'job_output/*' + - email-jenkins-admins-on-failure diff --git a/utils/test/reporting/reporting/reporting.yaml b/utils/test/reporting/reporting/reporting.yaml index 2a4aa492c..1e2e9a476 100644 --- a/utils/test/reporting/reporting/reporting.yaml +++ b/utils/test/reporting/reporting/reporting.yaml @@ -42,8 +42,10 @@ functest: test_conf: https://git.opnfv.org/cgit/functest/plain/functest/ci/testcases.yaml log_level: ERROR jenkins_url: https://build.opnfv.org/ci/view/functest/job/ + # yamllint disable rule:truthy exclude_noha: False exclude_virtual: False + # yamllint enable yardstick: test_conf: https://git.opnfv.org/cgit/yardstick/plain/tests/ci/report_config.yaml diff --git a/utils/test/testapi/3rd_party/static/testapi-ui/assets/lib/angular-confirm-modal/.travis.yml b/utils/test/testapi/3rd_party/static/testapi-ui/assets/lib/angular-confirm-modal/.travis.yml index 3674c3c20..f7913ea98 100644 --- a/utils/test/testapi/3rd_party/static/testapi-ui/assets/lib/angular-confirm-modal/.travis.yml +++ b/utils/test/testapi/3rd_party/static/testapi-ui/assets/lib/angular-confirm-modal/.travis.yml @@ -1,3 +1,4 @@ +--- language: node_js node_js: - "0.12" @@ -8,4 +9,4 @@ before_script: before_install: - export CHROME_BIN=chromium-browser - export DISPLAY=:99.0 - - sh -e /etc/init.d/xvfb start \ No newline at end of file + - sh -e /etc/init.d/xvfb start diff --git a/utils/test/testapi/3rd_party/static/testapi-ui/assets/lib/bootstrap/grunt/sauce_browsers.yml b/utils/test/testapi/3rd_party/static/testapi-ui/assets/lib/bootstrap/grunt/sauce_browsers.yml index 04e90928a..8d3d79dc1 100644 --- a/utils/test/testapi/3rd_party/static/testapi-ui/assets/lib/bootstrap/grunt/sauce_browsers.yml +++ b/utils/test/testapi/3rd_party/static/testapi-ui/assets/lib/bootstrap/grunt/sauce_browsers.yml @@ -1,3 +1,4 @@ +--- [ # Docs: https://saucelabs.com/docs/platforms/webdriver -- 2.16.6