From 1db085d5ecfef7aaa4a9b8352cd68663c67c469f Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 23 Dec 2015 13:36:33 +0100 Subject: [PATCH] Wrap some overly long lines To cut down on noise when running bashate, wrap some overlong lines. Change-Id: I23dcffbae2539d3d6b11e5527f3d4cbf08a18064 --- jenkins/scripts/bump-milestone.sh | 3 ++- jenkins/scripts/create-ppa-package.sh | 3 ++- jenkins/scripts/grab_console_log.sh | 4 +++- jenkins/scripts/jenkinsci-upload.sh | 6 ++++-- nodepool/scripts/configure_mirror.sh | 3 ++- nodepool/scripts/convert_node_to_xenserver.sh | 12 ++++++++---- nodepool/scripts/install_devstack_dependencies.sh | 3 ++- nodepool/scripts/prepare_node_devstack.sh | 8 ++++++-- .../scripts/prepare_node_devstack_virt_preview.sh | 3 ++- nodepool/scripts/restrict_memory.sh | 7 +++++-- tools/build-dib-in-docker.sh | 5 ++++- tools/run-bashate.sh | 3 ++- 12 files changed, 42 insertions(+), 18 deletions(-) diff --git a/jenkins/scripts/bump-milestone.sh b/jenkins/scripts/bump-milestone.sh index fd9832593a..2be8c0ffb7 100644 --- a/jenkins/scripts/bump-milestone.sh +++ b/jenkins/scripts/bump-milestone.sh @@ -27,7 +27,8 @@ then # Delete everything so the first commit is truly empty: git rm -rf . # git rm -rf leaves submodule directories: - find -maxdepth 1 -not -regex '\./\.git\(/.*\)?' -not -name . -exec rm -fr {} \; + find -maxdepth 1 -not -regex '\./\.git\(/.*\)?' -not -name . \ + -exec rm -fr {} \; ls -la else git branch -D release || /bin/true diff --git a/jenkins/scripts/create-ppa-package.sh b/jenkins/scripts/create-ppa-package.sh index 828533c0ad..e1cfc2c80f 100755 --- a/jenkins/scripts/create-ppa-package.sh +++ b/jenkins/scripts/create-ppa-package.sh @@ -63,7 +63,8 @@ export DEBEMAIL="soren@openstack.org" buildno=$BUILD_NUMBER pkgversion="${version}-0ubuntu0~${series}${buildno}" -dch -b --force-distribution --v "${pkgversion}" "Automated PPA build. Packaging revision: ${PACKAGING_REVNO}." -D $series +dch -b --force-distribution --v "${pkgversion}" \ + "Automated PPA build. Packaging revision: ${PACKAGING_REVNO}." -D $series dpkg-buildpackage -rfakeroot -S -sa -nc -k32EE128C if ! [ "$DO_UPLOAD" = "no" ]; then for ppa in $PPAS; do diff --git a/jenkins/scripts/grab_console_log.sh b/jenkins/scripts/grab_console_log.sh index 0640d9a91e..cb2af0804f 100755 --- a/jenkins/scripts/grab_console_log.sh +++ b/jenkins/scripts/grab_console_log.sh @@ -30,7 +30,9 @@ while ! grep -q "$END_UUID" /tmp/console.html; do # fails. This allows us to retry when we have Jenkins proxy # errors without polluting the output document. # --insecure because our Jenkins masters use self signed SSL certs. - curl -X POST --data "start=$(stat -c %s /tmp/console.html || echo 0)" --fail --insecure $BUILD_URL$console_log_path >> /tmp/console.html || true + curl -X POST --data "start=$(stat -c %s /tmp/console.html || echo 0)" \ + --fail --insecure $BUILD_URL$console_log_path \ + >> /tmp/console.html || true done # We need to add 
 tags around the output for log-osanalyze to not escape
diff --git a/jenkins/scripts/jenkinsci-upload.sh b/jenkins/scripts/jenkinsci-upload.sh
index 57899cab28..6ca4460239 100644
--- a/jenkins/scripts/jenkinsci-upload.sh
+++ b/jenkins/scripts/jenkinsci-upload.sh
@@ -36,11 +36,13 @@ JENKINSCI_REPO_CREDS="/home/jenkins/.jenkinsci-curl"
 curl -X PUT \
     --config ${JENKINSCI_REPO_CREDS} \
     --data-binary @${META_DATA_FILE} \
-    -i "${JENKINSCI_REPO}/${PROJECT}/${VERSION}/${META_DATA_FILE}" > /dev/null 2>&1
+    -i "${JENKINSCI_REPO}/${PROJECT}/${VERSION}/${META_DATA_FILE}" \
+    > /dev/null 2>&1
 
 curl -X PUT \
     --config ${JENKINSCI_REPO_CREDS} \
     --data-binary @${PLUGIN_FILE} \
-    -i "${JENKINSCI_REPO}/${PROJECT}/${VERSION}/${PLUGIN_FILE}" > /dev/null 2>&1
+    -i "${JENKINSCI_REPO}/${PROJECT}/${VERSION}/${PLUGIN_FILE}" \
+    > /dev/null 2>&1
 
 exit $?
diff --git a/nodepool/scripts/configure_mirror.sh b/nodepool/scripts/configure_mirror.sh
index a7a21432e7..041359c875 100755
--- a/nodepool/scripts/configure_mirror.sh
+++ b/nodepool/scripts/configure_mirror.sh
@@ -20,7 +20,8 @@ source /etc/nodepool/provider
 
 NODEPOOL_PYPI_MIRROR=${NODEPOOL_PYPI_MIRROR:-http://pypi.$NODEPOOL_REGION.openstack.org/simple}
 
-sudo sed -i -e "s,^index-url = .*,index-url = $NODEPOOL_PYPI_MIRROR," /etc/pip.conf
+sudo sed -i -e "s,^index-url = .*,index-url = $NODEPOOL_PYPI_MIRROR," \
+    /etc/pip.conf
 
 cat >/home/jenkins/.pydistutils.cfg < /dev/null ; then
         sudo update-grub
     else
@@ -27,5 +29,6 @@ if [ -f /etc/default/grub ] ; then
         sudo /usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
     fi
 elif [ -f /boot/grub/grub.conf ] ; then
-    sudo sed -i -e 's/^timeout=[0-9]\+/timeout=0/' -e 's/\(^\s\+kernel.*\)/\1 mem=9023M/' /boot/grub/grub.conf
+    sudo sed -i -e 's/^timeout=[0-9]\+/timeout=0/' \
+        -e 's/\(^\s\+kernel.*\)/\1 mem=9023M/' /boot/grub/grub.conf
 fi
diff --git a/tools/build-dib-in-docker.sh b/tools/build-dib-in-docker.sh
index 861f63a116..1e0279aa68 100644
--- a/tools/build-dib-in-docker.sh
+++ b/tools/build-dib-in-docker.sh
@@ -13,4 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-docker.io run --privileged=true -v ~/.cache:/.cache -v $(git rev-parse --show-toplevel):/opt/system-config -w /opt/system-config -i -t openstack_infra/ubuntu /bin/bash tools/build-image.sh
+docker.io run --privileged=true -v ~/.cache:/.cache -v \
+    $(git rev-parse --show-toplevel):/opt/system-config \
+    -w /opt/system-config -i -t openstack_infra/ubuntu \
+    /bin/bash tools/build-image.sh
diff --git a/tools/run-bashate.sh b/tools/run-bashate.sh
index 401444be4f..6374fe9b89 100755
--- a/tools/run-bashate.sh
+++ b/tools/run-bashate.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 
 ROOT=$(readlink -fn $(dirname $0)/.. )
-find $ROOT -not -wholename \*.tox/\* -and -not -wholename \*.test/\* -and -name \*.sh -print0 | xargs -0 bashate -v
+find $ROOT -not -wholename \*.tox/\* -and -not -wholename \*.test/\* \
+    -and -name \*.sh -print0 | xargs -0 bashate -v