From 619d78a4b4cdbb01821af75e5784578fce43043b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Joga?= Date: Wed, 9 Nov 2016 14:07:09 +0100 Subject: [PATCH] Fix line wrapping Some linewrapping in code blocs actually breaks the code Change-Id: Ibc8573c2ecaf6c9b780864f8f9878e11b06c2584 --- .../create-environment/autotests.rst | 2 +- .../create-environment/plugin-ci.rst | 6 +++--- .../plugin-ci/plugin-ci-job-examples.rst | 19 ++++++++++--------- .../plugin-ci/plugin-ci-workflow.rst | 4 ++-- .../create-plugin/install-plugin-builder.rst | 6 +++--- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/plugindocs/fuel-plugin-sdk-guide/create-environment/autotests.rst b/plugindocs/fuel-plugin-sdk-guide/create-environment/autotests.rst index f874c1b46..87c58dbdd 100644 --- a/plugindocs/fuel-plugin-sdk-guide/create-environment/autotests.rst +++ b/plugindocs/fuel-plugin-sdk-guide/create-environment/autotests.rst @@ -53,7 +53,7 @@ Follow these additional guidelines on creating and formating your own tests: .. code-block:: console - ./utils/jenkins/system_tests.sh -t test -w\ + ./utils/jenkins/system_tests.sh -t test -w \ $(pwd) -j fuelweb_test -i $ISO_PATH -o --group=setup #. For additional information, type: diff --git a/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci.rst b/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci.rst index 000cd78cf..8888e937a 100644 --- a/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci.rst +++ b/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci.rst @@ -43,7 +43,7 @@ and deploying new changes. set -e set -o pipefail - find . -name '*.pp' | xargs -P1 -L1 puppet parser\ + find . -name '*.pp' | xargs -P1 -L1 puppet parser \ validate --verbose find . -name '*.pp' | xargs -P1 -L1 puppet-lint \ --fail-on-warnings \ @@ -55,9 +55,9 @@ and deploying new changes. --no-autoloader_layout-check \ --no-class_inherits_from_params_class-check \ --no-documentation-check \ - --no-arrow_alignment-check\ + --no-arrow_alignment-check \ --no-case_without_default-check - find . -name '*.erb' | xargs -P1 -L1 -I '%'\ + find . -name '*.erb' | xargs -P1 -L1 -I '%' \ erb -P -x -T '-' % | ruby -c fpb --check ./ diff --git a/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-job-examples.rst b/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-job-examples.rst index bb4e9962a..111cd89f8 100644 --- a/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-job-examples.rst +++ b/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-job-examples.rst @@ -19,12 +19,13 @@ for plugins. ${BUILD_NUMBER} export VENV_PATH='/home/jenkins/\ venv-nailgun-tests-2.9' - YOUR_PLUGIN_PATH="$(ls ./*rpm)"\#Change\ - this to appropriate fuel-qa variable for your plugin - export YOUR_PLUGIN_PATH# + # Change this to appropriate fuel-qa + # variable for your plugin + YOUR_PLUGIN_PATH="$(ls ./*rpm)" + export YOUR_PLUGIN_PATH - sh -x "${SYSTEM_TESTS}" -w "${WORKSPACE}" -V\ - "${VENV_PATH}" -i "${ISO_PATH}" -t test -o\ + sh -x "${SYSTEM_TESTS}" -w "${WORKSPACE}" -V \ + "${VENV_PATH}" -i "${ISO_PATH}" -t test -o \ --group="${TEST_GROUP}" * prepare_env.sh: @@ -42,7 +43,7 @@ for plugins. REQS_PATH="${WORKSPACE}/fuel-qa/\ fuelweb_test/requirements.txt" - virtualenv --system-site-packages\ + virtualenv --system-site-packages \ "${VENV_PATH}" source "${VENV_PATH}/bin/activate" pip install -r "${REQS_PATH}" --upgrade @@ -59,11 +60,11 @@ for plugins. #!/bin/bash set -ex - find . -name '*.erb' -print 0 | xargs -0 -P1\ + find . -name '*.erb' -print 0 | xargs -0 -P1 \ -I '%' erb -P -x -T '-' % | ruby -c - find . -name '*.pp' -print 0| xargs -0 -P1\ + find . -name '*.pp' -print 0| xargs -0 -P1 \ puppet parser validate --verbose - find . -name '*.pp' -print 0| xargs -0 -P1\ + find . -name '*.pp' -print 0| xargs -0 -P1 \ puppet-lint \ --fail-on-warnings \ --with-context \ diff --git a/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-workflow.rst b/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-workflow.rst index 99ae4fb63..0020aaf17 100644 --- a/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-workflow.rst +++ b/plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-workflow.rst @@ -17,8 +17,8 @@ The Fuel developers team recommends that you follow this CI workflow: .. code-block:: console - $ fuel-main/utils/jenkins/system_tests -t test -j\ - dis_fuelweb_test -i (path to downloaded Fuel-ISO)\ + $ fuel-main/utils/jenkins/system_tests -t test -j \ + dis_fuelweb_test -i (path to downloaded Fuel-ISO) \ -o --group=setup -V ${VIRTUAL_ENV} -k * Create or restore the required empty VMs from snapshots. diff --git a/plugindocs/fuel-plugin-sdk-guide/create-plugin/install-plugin-builder.rst b/plugindocs/fuel-plugin-sdk-guide/create-plugin/install-plugin-builder.rst index e535b4275..42ce2c6c6 100644 --- a/plugindocs/fuel-plugin-sdk-guide/create-plugin/install-plugin-builder.rst +++ b/plugindocs/fuel-plugin-sdk-guide/create-plugin/install-plugin-builder.rst @@ -14,7 +14,7 @@ You must use the Fuel Master node as the build environment. .. code-block:: console - yum install -y git python-mako createrepo dpkg-devel dpkg-dev rpm\ + yum install -y git python-mako createrepo dpkg-devel dpkg-dev rpm \ rpm-build #. Clone the Fuel Plugin Builder repository: @@ -38,7 +38,7 @@ You must use the Fuel Master node as the build environment. The ``tasks.yaml`` file is required for the plugin to build, even if the file is empty. - + .. note:: If the plugin metadata does not specify the same version of OpenStack as the one supported by the Fuel Master node, on which the plugin is installed, you will not see any @@ -67,4 +67,4 @@ You must use the Fuel Master node as the build environment. print pkg_resources.get_distribution\ ("fuel-plugin-builder").version' - This should display ``4.0.0``. \ No newline at end of file + This should display ``4.0.0``.