openstack/project-config
Code Issues Proposed changes

Remove unmatched single quotes from jenkins jobs

Browse Source 
The v3 migration script can handle these just fine - but if we go ahead
and remove them the output can be predominantely shell rather than
script.

Change-Id: I440851a0149e1cc7f8c5c6e8a4e3e0b94088ee82
This commit is contained in:
Monty Taylor 2017-09-18 14:50:13 -05:00
parent ebeb36be04
commit b4fd783219
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
21 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jenkins/jobs/ansible-role-jobs.yaml
View File

@ -84,7 +84,7 @@
# NOTE(mhayden): The CentOS CI image has many repositories enabled by
# default that can cause package conflicts. We must disable all of
# them here and only enable base, updates, and epel.
# We also don't want to run this on Fedora.
# We also do not want to run this on Fedora.
if [[ -x /usr/bin/yum-config-manager ]] && [[ -e /etc/centos-release ]]; then
sudo yum-config-manager --disable \* >/dev/null
sudo yum-config-manager --enable base >/dev/null
@ -96,7 +96,7 @@
# NOTE(mhayden): EPEL is no longer required after installing distro
# packages with bindep. Individual roles may re-enable EPEL if they
# need it for their package installation tasks.
# We also don't want to run this on Fedora.
# We also do not want to run this on Fedora.
if [[ -x /usr/bin/yum-config-manager ]] && [[ -e /etc/centos-release ]]; then
sudo yum-config-manager --disable epel >/dev/null
fi
@ -119,7 +119,7 @@
fi
publishers:
# Although these aren't devstack jobs, we want to capture logs
# Although these are not devstack jobs, we want to capture logs
# similar in nature to devstack (Ansible logs, system logs, etc.)
- devstack-logs
- console-log

2
jenkins/jobs/ara.yaml
View File

@ -90,7 +90,7 @@
- shell: |
/usr/local/jenkins/slave_scripts/run-tox.sh functional
publishers:
# Although these aren't devstack jobs, we want to capture logs
# Although these are not devstack jobs, we want to capture logs
# similar in nature to devstack (Ansible logs, system logs, etc.)
- devstack-logs
- console-log

2
jenkins/jobs/blazar.yaml
View File

@ -33,7 +33,7 @@
# Install blazar tempest integration
BLAZAR_TEMPEST_DIR=/opt/stack/new/blazar/contrib/tempest
# Copying Tempest test suites
# This will be removed once blazar's tempest starts to use TempestPlugin
# This will be removed once blazar tempest starts to use TempestPlugin
if [ -e $BLAZAR_TEMPEST_DIR ] ; then
TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest}
cp -R $BLAZAR_TEMPEST_DIR/tempest/* $TEMPEST_DIR/tempest

2
jenkins/jobs/congress.yaml
View File

@ -85,7 +85,7 @@
disable_service s-container
disable_service s-object
disable_service s-proxy
# without Swift, c-bak can't run (in the Gate at least)
# without Swift, c-bak cannot run (in the Gate at least)
disable_service c-bak
# disable all plug-ins for now except congress
# enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer

28
jenkins/jobs/devstack-gate.yaml
View File

@ -17,17 +17,17 @@
# place calls for all hooks in here
function pre_test_hook {{
echo "I'm totally an awesome pre_test_hook"
echo "I am totally an awesome pre_test_hook"
}}
export -f pre_test_hook
function gate_hook {{
echo "I'm totally an awesome gate_hook"
echo "I am totally an awesome gate_hook"
}}
export -f gate_hook
function post_test_hook {{
echo "I'm totally an awesome post_test_hook"
echo "I am totally an awesome post_test_hook"
}}
export -f post_test_hook
@ -77,7 +77,7 @@
# instead of the released library version(s).
#
# Purpose: this allows libraries to test their proposed commits to
# ensure they don't break OpenStack on their next release. It is
# ensure they do not break OpenStack on their next release. It is
# expected to eventually be part of all library jobs in OpenStack, as
# the main tempest-dsvm jobs will be using only released versions of
# libraries.
@ -128,7 +128,7 @@
# version. This uses neutron instead of nova-network.
#
# Purpose: this allows libraries to test their proposed commits to
# ensure they don't break OpenStack on their next release. It is
# ensure they do not break OpenStack on their next release. It is
# expected to eventually be part of all library jobs in OpenStack, as
# the main tempest-dsvm jobs will be using only released versions of
# libraries.
@ -405,7 +405,7 @@
# and it runs tempest slow and scenario tests, and compute live migration
# tests. Of particular interest is the TestVolumeMigrateRetypeAttached scenario
# test which performs a volume retype of a volume attached to a server instance
# as it's root disk.
# as its root disk.
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-scenario-multinode-lvm-multibackend-{node-release}{suffix}'
node: '{node}'
@ -768,7 +768,7 @@
disable_service s-container
disable_service s-object
disable_service s-proxy
# without Swift, c-bak can't run (in the Gate at least)
# without Swift, c-bak cannot run (in the Gate at least)
disable_service c-bak
- shell: |
#!/bin/bash -xe
@ -1021,7 +1021,7 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup
# NOTE(mriedem): Be explicit that we need to run nova-network so that
# devstack-gate doesn't default to use neutron.
# devstack-gate does not default to use neutron.
export DEVSTACK_GATE_NEUTRON=0
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -1078,8 +1078,8 @@
- job-template:
# Note this job runs with nova net so it only needs to run on trusty
# for mitaka. It cannot run on newton because nova net doesn't exist
# in ocata. For this reason we don't have a xenial version of the job.
# for mitaka. It cannot run on newton because nova net does not exist
# in ocata. For this reason we do not have a xenial version of the job.
name: '{pipeline}-grenade-dsvm-forward-{node}{suffix}'
node: '{node}'
@ -1101,7 +1101,7 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=forward
# NOTE(mriedem): Be explicit that we need to run nova-network so that
# devstack-gate doesn't default to use neutron.
# devstack-gate does not default to use neutron.
export DEVSTACK_GATE_NEUTRON=0
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -2362,7 +2362,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
# BDD driver doesn't support 'in-use' volume attachement so we need to skip such tests
# BDD driver does not support 'in-use' volume attachement so we need to skip such tests
export DEVSTACK_GATE_TEMPEST_REGEX="^(?!.*(volume_in_use|test_volume_boot_pattern)).*volume"
export TEMPEST_CONCURRENCY=1
export PROJECTS="openstack/devstack-plugin-bdd $PROJECTS"
@ -2400,7 +2400,7 @@
export PROJECTS="openstack-infra/os-loganalyze $PROJECTS"
function post_test_hook {{
# Copy the tempest output to os-loganalze's DocumentRoot
# Copy the tempest output to the os-loganalyze DocumentRoot
sudo cp -r logs/* /var/www/logs/
# Grab normally marked up file
wget --header="Accept: text/html" http://localhost:8080/tempest.txt.gz
@ -2479,4 +2479,4 @@
# from this list as stable/newton grenade jobs upgrade from trusty nodes
# and ocata changes only run with nova-network in cells v1 configurations
# which does not apply for the nova-net grenade job. So we just simply
# don't run that job anywhere as it's no longer a supported config.
# do not run that job anywhere as it is no longer a supported config.

2
jenkins/jobs/include/run-project-guide.sh
View File

@ -41,7 +41,7 @@ elif [ "$ZUUL_REFNAME" == "master" ] ; then
elif echo $ZUUL_REFNAME | grep stable/ >/dev/null ; then
# Put stable release changes in dir named after stable release under the
# build dir. When Jenkins copies these files they will be accessible under
# the developer docs root using the stable release's name.
# the developer docs root using the name of the stable release.
TARGET=$(echo $ZUUL_REFNAME | sed 's/stable.//')
else
# Put other branch changes in dir named after branch under the

2
jenkins/jobs/infra.yaml
View File

@ -298,7 +298,7 @@
builders:
- shell: |
#!/bin/bash -x
# We don't want this file to conflict with the log index
# We do not want this file to conflict with the log index
if test -f output/index.html; then
mv output/index.html output/site-index.html
fi

10
jenkins/jobs/ironic.yaml
View File

@ -26,7 +26,7 @@
builders:
- ironic-vars-early:
script: |
# Set this early so that we don't have to be as careful with builder ordering in jobs.
# Set this early so that we do not have to be as careful with builder ordering in jobs.
export GRENADE_PLUGINRC="enable_grenade_plugin ironic https://git.openstack.org/openstack/ironic"
- ironic-extra-vars:
@ -188,7 +188,7 @@
# use tempest plugin
if [[ "$ZUUL_BRANCH" != "master" ]] ; then
# NOTE(jroll) if this isn't a patch against master, then
# NOTE(jroll) if this is not a patch against master, then
# fetch master to install the plugin
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic-inspector'"
else
@ -233,7 +233,7 @@
script: |
# use tempest plugin
if [[ "$ZUUL_BRANCH" != "master" ]] ; then
# NOTE(jroll) if this isn't a patch against master, then
# NOTE(jroll) if this is not a patch against master, then
# fetch master to install the plugin
export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' git+git://git.openstack.org/openstack/ironic'"
else
@ -411,7 +411,7 @@
[[local|localrc]]
enable_plugin ironic git://git.openstack.org/openstack/ironic
IRONIC_DEPLOY_DRIVER=fake
# neutron isn't enabled here
# neutron is not enabled here
IRONIC_ENABLED_NETWORK_INTERFACES=noop
IRONIC_DHCP_PROVIDER=none
- shell: |
@ -1026,7 +1026,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
# NOTE(deva): tempest-lib support was added in Mitaka
# but this job doesn't run on stable branches, so we can keep it simple here
# but this job does not run on stable branches, so we can keep it simple here
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export DEVSTACK_GATE_IRONIC=1
export DEVSTACK_GATE_NEUTRON=1

4
jenkins/jobs/javascript.yaml
View File

@ -19,7 +19,7 @@
# Executes a command registered inside of package.json. For more information on
# how this works, see https://docs.npmjs.com/cli/run-script. This build assumes
# that whatever is being run under the hood, it will pipe its output to the
# ./reports directory in the projects' root directory. This output is
# ./reports directory in the project root directory. This output is
# subsequently copied to static.openstack.org (the clickthrough target from
# gerrit).
- job-template:
@ -307,7 +307,7 @@
keep-hierarchy: true
copy-after-failure: true
# We're uploading the compiled app as a pre-release sanity check,
# We upload the compiled app as a pre-release sanity check,
# much like we do with docs builds.
- target: 'docs-draft/$LOG_PATH'
source: 'dist/**'

12
jenkins/jobs/macros.yaml
View File

@ -64,7 +64,7 @@
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org $ZUUL_PROJECT openstack/requirements
# REQS_DIR is not set for openstack/requirements and there's also
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
@ -99,7 +99,7 @@
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
--branch=$BRANCH \
git://git.openstack.org $ZUUL_PROJECT openstack/requirements
# REQS_DIR is not set for openstack/requirements and there's also
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
@ -132,7 +132,7 @@
fi
/usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
git://git.openstack.org {project} openstack/requirements
# REQS_DIR is not set for openstack/requirements and there's also
# REQS_DIR is not set for openstack/requirements and there is also
# no need to copy in this case.
if [[ "{project}" != "openstack/requirements" ]]; then
cp $REQS_DIR/upper-constraints.txt ./
@ -372,7 +372,7 @@
sudo apt-get update
sudo apt-get install -y nodejs
# Output to the log for debugging's sake.
# Output to the log for debugging sake.
node --version
npm --version
@ -427,7 +427,7 @@
export -f pre_test_hook
function post_test_hook {{
# If you need access to devstack's clouds.yaml file, it is available
# If you need access to devstack clouds.yaml file, it is available
# at its canonical location at /etc/openstack/clouds.yaml
# Try running as a standard lifecycle script, otherwise try custom.
@ -875,7 +875,7 @@
builders:
- shell: |
#!/bin/bash -xe
# create a large-ish file that we'll mount as a loopback
# create a large-ish file that we will mount as a loopback
truncate -s 1GB {xfs_file}
# format the new file as xfs
/sbin/mkfs.xfs {xfs_file}

8
jenkins/jobs/manila.yaml
View File

@ -532,7 +532,7 @@
function pre_test_hook {{
# Configure Manila with a CephFS Native or NFS driver backend.
# Refer job-template's pre_test_hook for more details on the
# Refer to job-template pre_test_hook for more details on the
# arguments.
source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \
false cephfs{variant} singlebackend
@ -542,7 +542,7 @@
function post_test_hook {{
# Configure and run Tempest API tests on Manila with a
# CephFSNative driver backend.
# Refer job-template's post_test_hook for more details on the
# Refer to job-template post_test_hook for more details on the
# arguments.
source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \
singlebackend cephfs{variant} api
@ -613,7 +613,7 @@
function pre_test_hook {{
# Configure Manila with a CephFS Native or NFS driver backend.
# Refer job-template's pre_test_hook for more details on the
# Refer to job-template pre_test_hook for more details on the
# arguments.
source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \
false cephfs{variant} singlebackend
@ -623,7 +623,7 @@
function post_test_hook {{
# Configure and run Tempest API tests on Manila with a
# CephFSNative driver backend.
# Refer job-template's post_test_hook for more details on the
# Refer to job-template post_test_hook for more details on the
# arguments.
source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \
singlebackend cephfs{variant} api

2
jenkins/jobs/mistral.yaml
View File

@ -69,7 +69,7 @@
- shell: |
# TODO: this is a temporary solution that puts all installation
# code into a script residing in mistral repo just for more
# convenient debugging (since we'll be able to send patchsets to
# convenient debugging (since we will be able to send patchsets to
# mistral with "check experimental" and trigger the gate). After
# it's ready it'll be better to create a special builder in this
# file.

4
jenkins/jobs/openstack-publish-jobs.yaml
View File

@ -42,7 +42,7 @@
tag=$(echo $ZUUL_REFNAME | cut -d/ -f3-)
branch_name=""
else
# If the ref wasn't a tag, assume it is a branch.
# If the ref was not a tag, assume it is a branch.
branch_name=$ZUUL_REFNAME
tag=""
fi
@ -143,7 +143,7 @@
# repository where the current patch just merged, but it
# honors zuul configuration variables that may cause it to
# check out a patch merged into a stable branch. So, reset
# what we've checked out to master.
# what we have checked out to master.
#
git checkout origin/master
- shell:

6
jenkins/jobs/osc.yaml
View File

@ -44,7 +44,7 @@
# NOTE(stevemar): After the newton release was tagged the file was moved.
# But, we run functional tests for various stable releases
# (mitaka, and newton).
# TODO(stevemar): Remove this check when Newton is EOL'ed.
# TODO(stevemar): Remove this check when Newton hits EOL.
hook_location=$BASE/new/python-openstackclient/openstackclient/tests/functional/post_test_hook.sh
if [ ! -f "$hook_location" ]; then
hook_location=$BASE/new/python-openstackclient/post_test_hook.sh
@ -91,7 +91,7 @@
disable_service s-container
disable_service s-object
disable_service s-proxy
# This is insufficient, but I'm leaving it here as a reminder of what may
# This is insufficient, but leaving it here as a reminder of what may
# someday be all we need to make this work
disable_python3_package swift
# NOTE(dtroyer): OSC needs to support Volume v1 for a while yet so re-enable
@ -179,7 +179,7 @@
# NOTE(stevemar): After the newton release was tagged the file was moved.
# But, we run functional tests for various stable releases
# (mitaka, and newton).
# TODO(stevemar): Remove this check when Newton is EOL'ed.
# TODO(stevemar): Remove this check when Newton hits EOL.
hook_location=$BASE/new/python-openstackclient/openstackclient/tests/functional/post_test_hook.sh
if [ ! -f "$hook_location" ]; then
hook_location=$BASE/new/python-openstackclient/post_test_hook.sh

2
jenkins/jobs/patrole.yaml
View File

@ -75,7 +75,7 @@
disable_service s-container
disable_service s-object
disable_service s-proxy
# Without Swift, c-bak can't run (in the Gate at least)
# Without Swift, c-bak cannot run (in the Gate at least)
disable_service c-bak
- shell: |
#!/bin/bash -xe

4
jenkins/jobs/projects.yaml
View File

@ -2170,7 +2170,7 @@
- pypi-jobs
- gate-{name}-pylint-{node}:
node: ubuntu-xenial
# The "-extras-nv" jobs are tests that we don't want to gate on
# The "-extras-nv" jobs are tests that we do not want to gate on
# just yet. Note opensuse-minimal can only run on Xenial due to
# requring zypper on the host.
- gate-dib-dsvm-functests-{python}-{node}{suffix}:
@ -6128,7 +6128,7 @@
node: ubuntu-xenial
suffix: '-nv'
branch-override: default
# networking-ovn doesn't have branches older than newton. By running
# networking-ovn does not have branches older than newton. By running
# grenade with ubuntu-xenial in the name we automatically pin
# grenade against this project to run starting with master which
# should be fine because there is nothing before newton to upgrade from.

2
jenkins/jobs/puppet-module-jobs.yaml
View File

@ -362,7 +362,7 @@
find . -name openstack-*.tar.gz | sed -e "p;s/openstack-/puppet-/" | xargs -n2 mv
mkdir -p dist
if echo $ZUUL_REFNAME | grep refs/tags/ >/dev/null ; then
# NOTE(pabelanger) We don't need to rename tagged tarballs as `puppet
# NOTE(pabelanger) We do not need to rename tagged tarballs as `puppet
# module build` does the right thing.
mv pkg/*.tar.gz dist/
else

8
jenkins/jobs/python-jobs.yaml
View File

@ -550,7 +550,7 @@
TOOLS_DIR=$TOOLS_TMP/openstack-infra/release-tools
# Install the distro packages needed by the release
# tools. These won't necessarily be included in the set
# tools. These will not necessarily be included in the set
# installed by the builder step above, so we have to do it
# explicitly by changing to the tools directory and then
# running the same script.
@ -619,9 +619,9 @@
- 'gate-{name}-docs-{node}'
- 'gate-{name}-requirements'
- '{name}-branch-tarball'
# pylint isn't standard
# pypy isn't standard
# gate-{name}-tox-{envlist} also isn't standard, but is reserved for
# pylint is not standard
# pypy is not standard
# gate-{name}-tox-{envlist} also is not standard, but is reserved for
# projects that want to run specific jobs via tox
- job-group:

2
jenkins/jobs/release-jobs.yaml
View File

@ -9,7 +9,7 @@
- shell: |
#!/bin/bash -ex
# Tell the launchpad script run from release.sh where it's
# Tell the launchpad script run from release.sh where its
# credentials file is.
export LP_CREDS_FILE=$HOME/.launchpadlib/creds

4
jenkins/jobs/shade.yaml
View File

@ -38,7 +38,7 @@
#!/bin/bash -xe
if [ "{legacy}" == "-legacy" ]; then
export DEVSTACK_GATE_NEUTRON=0
# the local.conf macro doesn't allow for conditional setting.
# the local.conf macro does not allow for conditional setting.
# Set the default above, then edit it here for the legacy case
# where we want to flip the bit. This should work unless someone
# redefines the /tmp/dg-local.conf location in the local_conf:
@ -70,7 +70,7 @@
if [ "{legacy}" == "-legacy" ]; then
# The purpose of the -legacy-libs job is to test that latest
# libs work with old OpenStack. We don't want to install
# libs work with old OpenStack. We do not want to install
# OpenStack from tip of master of the libs. We want to
# install tip of master of the libs into our functional venv.
export OVERRIDE_OS_CLIENT_CONFIG_PROJECT_BRANCH="master"

2
jenkins/jobs/tripleo.yaml
View File

@ -121,7 +121,7 @@
#!/bin/bash -xe
export TOCI_JOBTYPE={type}
# ZUUL Doesn't set these for periodic jobs
# ZUUL does not set these for periodic jobs
export ZUUL_BRANCH=${{ZUUL_BRANCH:-master}}
export ZUUL_REF=${{ZUUL_REF:-None}}