From 21b30c84b1abd6b35db2decdb075dfa82f39fed3 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 10 May 2019 20:12:45 -0400 Subject: [PATCH] Resolve yamllint issues * Truthiness values should be true|false * Document start should being with '---' * Improper indentation * Ignore line-length for packer as URL gets can be long Change-Id: I8375f8bbf486a22677e354189148786d7d5126be Signed-off-by: Thanh Ha --- docs/conf.yaml | 1 + jjb/netconf/netconf-scale.yaml | 88 +++++++++++------------ jjb/releng-packer-jobs.yaml | 24 +++---- packer/provision/examples/apache-e-w.yaml | 1 + packer/provision/examples/apache-n-s.yaml | 1 + packer/provision/examples/apache-pod.yaml | 5 +- packer/provision/examples/busybox.yaml | 13 ++-- packer/provision/examples/nginx-pod.yaml | 5 +- packer/provision/mininet-ovs-2.8.yaml | 2 +- packer/provision/robot.yaml | 4 +- yamllint.conf | 3 + 11 files changed, 78 insertions(+), 69 deletions(-) diff --git a/docs/conf.yaml b/docs/conf.yaml index 35bb42740..7498f1872 100644 --- a/docs/conf.yaml +++ b/docs/conf.yaml @@ -1,2 +1,3 @@ +--- project_cfg: opendaylight project: releng/builder diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 8c27672cf..2204b211b 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -37,47 +37,47 @@ odl_system_flavor: odl-standard-4 - project: - name: netconf-csit-scale-max-devices - jobs: - - inttest-csit-1node - - # The project name - project: 'netconf' - - # The functionality under test - functionality: 'scale-max-devices' - - # Project branches - stream: - - sodium: - branch: 'master' - - neon: - branch: 'stable/neon' - - fluorine: - branch: 'stable/fluorine' - - install: - - only: - scope: 'only' - - # Features to install - install-features: > - odl-restconf, - odl-clustering-test-app, - odl-netconf-mdsal, - odl-netconf-topology, - odl-jolokia, - decanter-collector-jmx, - decanter-appender-elasticsearch - - # Robot custom options - robot-options: '-v USE_NETCONF_CONNECTOR:False' - - # ODL system configuration - odl_system_flavor: odl-standard-8 - - # Plot Info - 01-plot-title: 'Max Devices' - 01-plot-yaxis: 'Devices' - 01-plot-group: 'Netconf Devices' - 01-plot-data-file: 'devices.csv' + name: netconf-csit-scale-max-devices + jobs: + - inttest-csit-1node + + # The project name + project: 'netconf' + + # The functionality under test + functionality: 'scale-max-devices' + + # Project branches + stream: + - sodium: + branch: 'master' + - neon: + branch: 'stable/neon' + - fluorine: + branch: 'stable/fluorine' + + install: + - only: + scope: 'only' + + # Features to install + install-features: > + odl-restconf, + odl-clustering-test-app, + odl-netconf-mdsal, + odl-netconf-topology, + odl-jolokia, + decanter-collector-jmx, + decanter-appender-elasticsearch + + # Robot custom options + robot-options: '-v USE_NETCONF_CONNECTOR:False' + + # ODL system configuration + odl_system_flavor: odl-standard-8 + + # Plot Info + 01-plot-title: 'Max Devices' + 01-plot-yaxis: 'Devices' + 01-plot-group: 'Netconf Devices' + 01-plot-data-file: 'devices.csv' diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml index e78f608c9..8ee10a8d7 100644 --- a/jjb/releng-packer-jobs.yaml +++ b/jjb/releng-packer-jobs.yaml @@ -60,21 +60,21 @@ templates: devstack-pre-pip-queens - project: - name: packer-devstack-pre-pip-rocky-jobs - jobs: - - gerrit-packer-merge + name: packer-devstack-pre-pip-rocky-jobs + jobs: + - gerrit-packer-merge - project: releng/builder - project-name: builder - branch: master - archive-artifacts: '**/*.log' + project: releng/builder + project-name: builder + branch: master + archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g - build-timeout: 75 - cron: '00 H 1 * *' + build-node: centos7-builder-2c-1g + build-timeout: 75 + cron: '00 H 1 * *' - platforms: centos-7 - templates: devstack-pre-pip-rocky + platforms: centos-7 + templates: devstack-pre-pip-rocky - project: name: packer-docker-jobs diff --git a/packer/provision/examples/apache-e-w.yaml b/packer/provision/examples/apache-e-w.yaml index bb84fa1b9..66e3ba520 100644 --- a/packer/provision/examples/apache-e-w.yaml +++ b/packer/provision/examples/apache-e-w.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: diff --git a/packer/provision/examples/apache-n-s.yaml b/packer/provision/examples/apache-n-s.yaml index 7b774e404..e99b52c34 100644 --- a/packer/provision/examples/apache-n-s.yaml +++ b/packer/provision/examples/apache-n-s.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: diff --git a/packer/provision/examples/apache-pod.yaml b/packer/provision/examples/apache-pod.yaml index cb97d1359..a4a01a86b 100644 --- a/packer/provision/examples/apache-pod.yaml +++ b/packer/provision/examples/apache-pod.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Pod metadata: @@ -6,5 +7,5 @@ metadata: name: webserver spec: containers: - - name: apachetwin - image: fedora/apache + - name: apachetwin + image: fedora/apache diff --git a/packer/provision/examples/busybox.yaml b/packer/provision/examples/busybox.yaml index babb7652f..a01315744 100644 --- a/packer/provision/examples/busybox.yaml +++ b/packer/provision/examples/busybox.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Pod metadata: @@ -5,10 +6,10 @@ metadata: namespace: default spec: containers: - - image: busybox - command: - - sleep - - "3600" - imagePullPolicy: IfNotPresent - name: busybox + - image: busybox + command: + - sleep + - "3600" + imagePullPolicy: IfNotPresent + name: busybox restartPolicy: Always diff --git a/packer/provision/examples/nginx-pod.yaml b/packer/provision/examples/nginx-pod.yaml index d72959ee7..779775abc 100644 --- a/packer/provision/examples/nginx-pod.yaml +++ b/packer/provision/examples/nginx-pod.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Pod metadata: @@ -6,5 +7,5 @@ metadata: name: webserver spec: containers: - - name: nginxtwin - image: nginx + - name: nginxtwin + image: nginx diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml index be38c19c2..dbd778465 100644 --- a/packer/provision/mininet-ovs-2.8.yaml +++ b/packer/provision/mininet-ovs-2.8.yaml @@ -119,7 +119,7 @@ dest: /usr/local/bin/cbench mode: 0755 owner: root - remote_src: yes + remote_src: true become: true - name: Install exabgp diff --git a/packer/provision/robot.yaml b/packer/provision/robot.yaml index 600fca12f..eb76e7b2a 100644 --- a/packer/provision/robot.yaml +++ b/packer/provision/robot.yaml @@ -67,8 +67,8 @@ dest: /usr/local/bin/udpreplay mode: 0755 owner: root - remote_src: yes - become: yes + remote_src: true + become: true post_tasks: - name: System Reseal diff --git a/yamllint.conf b/yamllint.conf index 32d76ab6e..fe0c97dcb 100644 --- a/yamllint.conf +++ b/yamllint.conf @@ -1,3 +1,4 @@ +--- extends: default rules: @@ -5,4 +6,6 @@ rules: max-end: 1 line-length: max: 120 + ignore: | + packer -- 2.36.6