openstack
/
fuel-docs
Code Issues Proposed changes

Merge "Fix line wrapping"

This commit is contained in:
Jenkins 2016-11-11 13:08:07 +00:00 committed by Gerrit Code Review
parent 3335cc7a48 619d78a4b4
commit 0c50d5fa2b
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugindocs/fuel-plugin-sdk-guide/create-environment/autotests.rst
View File

@ -53,7 +53,7 @@ Follow these additional guidelines on creating and formating your own tests:
.. code-block:: console .. 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 $(pwd) -j fuelweb_test -i $ISO_PATH -o --group=setup
#. For additional information, type: #. For additional information, type:

6
plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci.rst
View File

@ -43,7 +43,7 @@ and deploying new changes.
set -e set -e
set -o pipefail set -o pipefail
find . -name '*.pp' | xargs -P1 -L1 puppet parser\ find . -name '*.pp' | xargs -P1 -L1 puppet parser \
validate --verbose validate --verbose
find . -name '*.pp' | xargs -P1 -L1 puppet-lint \ find . -name '*.pp' | xargs -P1 -L1 puppet-lint \
--fail-on-warnings \ --fail-on-warnings \
@ -55,9 +55,9 @@ and deploying new changes.
--no-autoloader_layout-check \ --no-autoloader_layout-check \
--no-class_inherits_from_params_class-check \ --no-class_inherits_from_params_class-check \
--no-documentation-check \ --no-documentation-check \
--no-arrow_alignment-check\ --no-arrow_alignment-check \
--no-case_without_default-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 erb -P -x -T '-' % | ruby -c
fpb --check ./ fpb --check ./

19
plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-job-examples.rst
View File

@ -19,12 +19,13 @@ for plugins.
${BUILD_NUMBER} ${BUILD_NUMBER}
export VENV_PATH='/home/jenkins/\ export VENV_PATH='/home/jenkins/\
venv-nailgun-tests-2.9' venv-nailgun-tests-2.9'
YOUR_PLUGIN_PATH="$(ls ./*rpm)"\#Change\ # Change this to appropriate fuel-qa
this to appropriate fuel-qa variable for your plugin # variable for your plugin
export YOUR_PLUGIN_PATH# YOUR_PLUGIN_PATH="$(ls ./*rpm)"
export YOUR_PLUGIN_PATH
sh -x "${SYSTEM_TESTS}" -w "${WORKSPACE}" -V\ sh -x "${SYSTEM_TESTS}" -w "${WORKSPACE}" -V \
"${VENV_PATH}" -i "${ISO_PATH}" -t test -o\ "${VENV_PATH}" -i "${ISO_PATH}" -t test -o \
--group="${TEST_GROUP}" --group="${TEST_GROUP}"
* prepare_env.sh: * prepare_env.sh:
@ -42,7 +43,7 @@ for plugins.
REQS_PATH="${WORKSPACE}/fuel-qa/\ REQS_PATH="${WORKSPACE}/fuel-qa/\
fuelweb_test/requirements.txt" fuelweb_test/requirements.txt"
virtualenv --system-site-packages\ virtualenv --system-site-packages \
"${VENV_PATH}" "${VENV_PATH}"
source "${VENV_PATH}/bin/activate" source "${VENV_PATH}/bin/activate"
pip install -r "${REQS_PATH}" --upgrade pip install -r "${REQS_PATH}" --upgrade
@ -59,11 +60,11 @@ for plugins.
#!/bin/bash #!/bin/bash
set -ex 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 -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 puppet parser validate --verbose
find . -name '*.pp' -print 0| xargs -0 -P1\ find . -name '*.pp' -print 0| xargs -0 -P1 \
puppet-lint \ puppet-lint \
--fail-on-warnings \ --fail-on-warnings \
--with-context \ --with-context \

4
plugindocs/fuel-plugin-sdk-guide/create-environment/plugin-ci/plugin-ci-workflow.rst
View File

@ -17,8 +17,8 @@ The Fuel developers team recommends that you follow this CI workflow:
.. code-block:: console .. code-block:: console
$ fuel-main/utils/jenkins/system_tests -t test -j\ $ fuel-main/utils/jenkins/system_tests -t test -j \
dis_fuelweb_test -i (path to downloaded Fuel-ISO)\ dis_fuelweb_test -i (path to downloaded Fuel-ISO) \
-o --group=setup -V ${VIRTUAL_ENV} -k -o --group=setup -V ${VIRTUAL_ENV} -k
* Create or restore the required empty VMs from snapshots. * Create or restore the required empty VMs from snapshots.

6
plugindocs/fuel-plugin-sdk-guide/create-plugin/install-plugin-builder.rst
View File

@ -14,7 +14,7 @@ You must use the Fuel Master node as the build environment.
.. code-block:: console .. 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 rpm-build
#. Clone the Fuel Plugin Builder repository: #. 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 ``tasks.yaml`` file is required for the plugin to build, even if
the file is empty. the file is empty.
.. note:: If the plugin metadata does not specify the same version of .. note:: If the plugin metadata does not specify the same version of
OpenStack as the one supported by the Fuel Master node, OpenStack as the one supported by the Fuel Master node,
on which the plugin is installed, you will not see any 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\ print pkg_resources.get_distribution\
("fuel-plugin-builder").version' ("fuel-plugin-builder").version'
This should display ``4.0.0``. This should display ``4.0.0``.