Merge lp:~ltrager/maas/stress_ng_tests into lp:~maas-committers/maas/trunk

[Lee Trager]

Add stress-ng short cpu and memory tests and fix stress_ng_memory_long test.

Add stress-ng short cpu and memory tests. These tests run by default during commissioning and testing. This adds 10 minutes to commissioning time.

While testing I discovered the stress_ng_cpu_long fails due to using too much RAM. I've reworked it so while the OOM killer is tripped on a few stress-ng threads it still passes. I also fixed a bug where the script form was resetting any value that wasn't specified on update and new default scripts weren't being added in certain cases.

[Gavin Panella (allenap)]

I haven't reviewed the rest of this branch, but I'd like to suggest a policy: all shell scripts should be run with bash. Bash is fairly unpleasant for anything non-trivial, but /bin/sh in all its forms is hostile to sanity and happiness. Shell scripts are a blight, but if we must write them then let's at least stick to the least insane of the ubiquitous ones.

[Lee Trager (ltrager)]

Fully agree and implemented. I've been using /bin/sh because only because the existing commissioning script use it.

[Gavin Panella (allenap)]

Sorry, I wasn't clear. Despite the similarities between sh and bash a change from one to the other may introduce bugs, and we're close to release. I wanted your feedback on whether you thought a policy like that would be okay with you. I guess that's a yes! You may want to revert r5860 and keep it for another day. And sorry again: rereading my comment makes it clear to me now that it was unclear when I wrote it.

[Lee Trager (ltrager)]

I took a look how MAAS is using bash. Its used in simple commissioning and testing scripts, as part of unit tests, or in the user_data scripts. The commissioning and user_data scripts are tested pretty well by CI and bash is a superset of shell so it should be compatible even for more advanced scripts. I think its safe to switch, the riskiest would be the user_data scripts. If we really want to be cautious but move towards a bash world we could switch everywhere but the user data scripts for now.

[Mike Pontillo (mpontillo)]

The code looks good. I'll test it out a bit before I approve.

[Mike Pontillo (mpontillo)]

Oh, and please change 'sudo' to 'sudo -n' everywhere. I know the risk is small for scripts like these which run in the ephemeral environment, but I'd rather err on the safe side.

[Mike Pontillo (mpontillo)]

Saw this on a machine with 64 GB of RAM (4 cores, 8 with hyperthreading, if it matters).

Value 8262470656 is out of range for vm-bytes, allowed: 4096 .. 4294967296

review: Needs Fixing

[Lee Trager (ltrager)]

Thanks for running the tests! I've added -n to all test scripts which use sudo. The failure you saw was because stress-ng only allows 4GB of testing memory per thread. None of my test systems have more then 4GB total so I never ran into it. I've modified the stress-ng-memory tests to use enough threads so that no thread uses more then 4GB of RAM.

[Mike Pontillo (mpontillo)]

Thanks for the fix. Re-tested and it's looking good.

review: Approve

=== modified file 'src/maasserver/api/scripts.py'
--- src/maasserver/api/scripts.py	2017-03-23 18:20:00 +0000
+++ src/maasserver/api/scripts.py	2017-03-29 23:42:47 +0000
@@ -259,7 +259,8 @@
     def download(self, request, name):
         """Download a script.
 
-        :param revision: What revision to download, latest by default.
+        :param revision: What revision to download, latest by default. Can use
+            rev as a shortcut.
         :type revision: integer
         """
         if name.isdigit():
@@ -267,6 +268,8 @@
         else:
             script = get_object_or_404(Script, name=name)
         revision = get_optional_param(request.GET, 'revision', None, Int)
+        if revision is None:
+            revision = get_optional_param(request.GET, 'rev', None, Int)
         if revision is not None:
             for rev in script.script.previous_versions():
                 if rev.id == revision:
 
=== modified file 'src/maasserver/api/tests/test_scripts.py'
--- src/maasserver/api/tests/test_scripts.py	2017-03-23 18:20:00 +0000
+++ src/maasserver/api/tests/test_scripts.py	2017-03-29 23:42:47 +0000
@@ -356,6 +356,20 @@
         self.assertEquals(
             script.script.previous_version.data, response.content.decode())
 
+    def test_download_gets_previous_rev(self):
+        script = factory.make_Script()
+        script.script = script.script.update(factory.make_string())
+        script.save()
+        response = self.client.get(
+            self.get_script_uri(script),
+            {
+                'op': 'download',
+                'rev': script.script.previous_version.id,
+            })
+        self.assertThat(response, HasStatusCode(http.client.OK))
+        self.assertEquals(
+            script.script.previous_version.data, response.content.decode())
+
     def test_download_errors_on_unknown_revision(self):
         script = factory.make_Script()
         response = self.client.get(
 
=== modified file 'src/maasserver/forms/script.py'
--- src/maasserver/forms/script.py	2017-03-10 09:15:31 +0000
+++ src/maasserver/forms/script.py	2017-03-29 23:42:47 +0000
@@ -83,6 +83,11 @@
                 self, 'script_type',
                 'Must be %d, test, testing, %d, commission, or commissioning.'
                 % (SCRIPT_TYPE.TESTING, SCRIPT_TYPE.COMMISSIONING))
+        # If a field wasn't passed in keep the old values when updating.
+        if self.instance.id is not None:
+            for field in self._meta.fields:
+                if field not in self.data:
+                    cleaned_data[field] = getattr(self.instance, field)
         return cleaned_data
 
     def is_valid(self):
 
=== modified file 'src/maasserver/forms/tests/test_script.py'
--- src/maasserver/forms/tests/test_script.py	2017-03-10 09:15:31 +0000
+++ src/maasserver/forms/tests/test_script.py	2017-03-29 23:42:47 +0000
@@ -193,6 +193,30 @@
                 ]
             }, form.errors)
 
+    def test__update_script_doesnt_effect_other_fields(self):
+        script = factory.make_Script()
+        script_content = factory.make_string()
+        name = script.name
+        title = script.title
+        description = script.description
+        tags = script.tags
+        script_type = script.script_type
+        timeout = script.timeout
+        destructive = script.destructive
+
+        form = ScriptForm(data={'script': script_content}, instance=script)
+        self.assertTrue(form.is_valid(), form.errors)
+        script = form.save()
+
+        self.assertEquals(name, script.name)
+        self.assertEquals(title, script.title)
+        self.assertEquals(description, script.description)
+        self.assertEquals(tags, script.tags)
+        self.assertEquals(script_type, script.script_type)
+        self.assertEquals(timeout, script.timeout)
+        self.assertEquals(destructive, script.destructive)
+        self.assertFalse(script.default)
+
     def test__can_use_script_type_name(self):
         script_type_name = random.choice([
             'test', 'testing',
 
=== modified file 'src/metadataserver/builtin_scripts/__init__.py'
--- src/metadataserver/builtin_scripts/__init__.py	2017-03-29 21:13:51 +0000
+++ src/metadataserver/builtin_scripts/__init__.py	2017-03-29 23:42:47 +0000
@@ -7,6 +7,7 @@
     'load_builtin_scripts',
 ]
 
+from datetime import timedelta
 import os
 
 import attr
@@ -48,7 +49,8 @@
     tags = attr.ib(default=None, validator=instance_of(list))
     script_type = attr.ib(
         default=SCRIPT_TYPE.TESTING, validator=instance_of(int))
-    timeout = attr.ib(default=0, validator=instance_of(int))
+    timeout = attr.ib(
+        default=timedelta(seconds=0), validator=instance_of(timedelta))
     destructive = attr.ib(default=False, validator=instance_of(bool))
     filename = attr.ib(default=None, validator=instance_of(str))
 
@@ -63,7 +65,7 @@
         title='Storage status',
         description='Validate SMART health for all drives in parallel.',
         tags=['storage', 'commissioning'],
-        timeout=60 * 5,
+        timeout=timedelta(minutes=5),
         filename='smartctl.py',
         ),
     BuiltinScript(
@@ -73,7 +75,7 @@
             'Run the short SMART self-test and validate SMART health on all '
             'drives in parallel'),
         tags=['storage'],
-        timeout=60 * 10,
+        timeout=timedelta(minutes=10),
         filename='smartctl.py',
         ),
     BuiltinScript(
@@ -106,7 +108,7 @@
         title='Network validation',
         description='Download a file from images.maas.io.',
         tags=['network', 'internet'],
-        timeout=60 * 5,
+        timeout=timedelta(minutes=5),
         filename='internet_connectivity.sh',
         ),
     BuiltinScript(
@@ -114,23 +116,39 @@
         title='CPU validation',
         description='Run the stress-ng CPU tests over 12 hours.',
         tags=['cpu'],
-        timeout=60 * 60 * 12,
-        filename='stress_ng_cpu_long.sh',
+        timeout=timedelta(hours=12),
+        filename='stress-ng-cpu-long.sh',
+        ),
+    BuiltinScript(
+        name='stress-ng-cpu-short',
+        title='CPU validation',
+        description='Stress test the CPU for 5 minutes.',
+        tags=['cpu'],
+        timeout=timedelta(minutes=5),
+        filename='stress-ng-cpu-short.sh',
         ),
     BuiltinScript(
         name='stress-ng-memory-long',
         title='Memory integrity',
         description='Run the stress-ng memory tests over 12 hours.',
         tags=['memory'],
-        timeout=60 * 60 * 12,
-        filename='stress_ng_memory_long.sh',
+        timeout=timedelta(hours=12),
+        filename='stress-ng-memory-long.sh',
+        ),
+    BuiltinScript(
+        name='stress-ng-memory-short',
+        title='Memory validation',
+        description='Stress test memory for 5 minutes.',
+        tags=['memory'],
+        timeout=timedelta(minutes=5),
+        filename='stress-ng-memory-short.sh',
         ),
     BuiltinScript(
         name='ntp',
         title='NTP validation',
         description='Run ntp clock set to verify NTP connectivity.',
         tags=['network', 'ntp'],
-        timeout=60,
+        timeout=timedelta(minutes=1),
         filename='ntp.sh',
         ),
 ]
@@ -161,11 +179,15 @@
                 # Don't add back old versions of a script. This prevents two
                 # connected regions with different versions of a script from
                 # fighting with eachother.
+                no_update = False
                 for vtf in script_in_db.script.previous_versions():
                     if vtf.data == script_content:
                         # Don't update anything if we detect we have an old
                         # version of the builtin scripts
-                        return
+                        no_update = True
+                        break
+                if no_update:
+                    continue
                 script_in_db.script = script_in_db.script.update(
                     script_content,
                     "Updated by maas-%s" % get_maas_package_version())
 
=== modified file 'src/metadataserver/builtin_scripts/internet_connectivity.sh'
--- src/metadataserver/builtin_scripts/internet_connectivity.sh	2017-03-10 16:34:33 +0000
+++ src/metadataserver/builtin_scripts/internet_connectivity.sh	2017-03-29 23:42:47 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # internet_connectivity - Check if the system has access to the Internet.
 #
@@ -20,6 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Download the index.sjson file used by MAAS to download images to validate
-# internet connectivity. Close stderr so we don't get the progress from curl.
-curl -I -A maas_internet_connectivity_test \
-    https://images.maas.io/ephemeral-v3/daily/streams/v1/index.sjson
+# internet connectivity.
+URL="https://images.maas.io/ephemeral-v3/daily/streams/v1/index.sjson"
+echo "Attempting to retrieve: $URL"
+curl -ILSsv -A maas_internet_connectivity_test $URL
 
=== modified file 'src/metadataserver/builtin_scripts/memtester.sh'
--- src/metadataserver/builtin_scripts/memtester.sh	2017-03-23 18:20:00 +0000
+++ src/metadataserver/builtin_scripts/memtester.sh	2017-03-29 23:42:47 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # memtester - Run memtester against all available userspace memory.
 #
@@ -19,10 +19,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-sudo apt-get install -q -y memtester
+sudo -n apt-get install -q -y memtester
+echo
 
 # Memtester can only test memory available to userspace. Reserve 32M so the
 # test doesn't fail due to the OOM killer. Only run memtester against available
 # RAM once.
-sudo memtester \
+sudo -n memtester \
      $(awk '/MemAvailable/ { print ($2 - 32768) "K"}' /proc/meminfo) 1
 
=== modified file 'src/metadataserver/builtin_scripts/ntp.sh'
--- src/metadataserver/builtin_scripts/ntp.sh	2017-03-23 18:20:00 +0000
+++ src/metadataserver/builtin_scripts/ntp.sh	2017-03-29 23:42:47 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # ntp - Run ntp clock set to verify NTP connectivity.
 #
@@ -24,7 +24,7 @@
 # the configured NTP server is accessible.
 e=0
 ntpq -np
-sudo systemctl stop ntp.service
-sudo timeout 10 ntpd -gq || e=$?
-sudo systemctl start ntp.service
+sudo -n systemctl stop ntp.service
+sudo -n timeout 10 ntpd -gq || e=$?
+sudo -n systemctl start ntp.service
 exit $e
 
=== renamed file 'src/metadataserver/builtin_scripts/stress_ng_cpu_long.sh' => 'src/metadataserver/builtin_scripts/stress-ng-cpu-long.sh'
--- src/metadataserver/builtin_scripts/stress_ng_cpu_long.sh	2017-03-23 18:20:00 +0000
+++ src/metadataserver/builtin_scripts/stress-ng-cpu-long.sh	2017-03-29 23:42:47 +0000
@@ -1,6 +1,6 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
-# stress_ng_cpu_long - Run stress-ng memory tests over 12 hours.
+# stress-ng-cpu-long - Run stress-ng memory tests over 12 hours.
 #
 # Author: Lee Trager <[e-mail]>
 #
@@ -19,8 +19,8 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-sudo apt-get install -q -y stress-ng
+sudo -n apt-get install -q -y stress-ng
+echo
 
-sudo stress-ng \
-    --aggressive -a 0 --class cpu,cpu-cache --ignite-cpu --log-brief \
-    --metrics --times --tz --verify --timeout 12h
+sudo -n stress-ng --aggressive -a 0 --class cpu,cpu-cache --ignite-cpu \
+    --log-brief --metrics-brief --times --tz --verify --timeout 12h
 
=== added file 'src/metadataserver/builtin_scripts/stress-ng-cpu-short.sh'
--- src/metadataserver/builtin_scripts/stress-ng-cpu-short.sh	1970-01-01 00:00:00 +0000
+++ src/metadataserver/builtin_scripts/stress-ng-cpu-short.sh	2017-03-29 23:42:47 +0000
@@ -0,0 +1,32 @@
+#!/bin/bash -e
+#
+# stress-ng-cpu-short - Stress test the CPU for 5 minutes.
+#
+# Author: Lee Trager <[e-mail]>
+#
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+sudo -n apt-get install -q -y stress-ng
+echo
+
+sudo -n stress-ng --matrix 0 --ignite-cpu --log-brief --metrics-brief --times \
+    --tz --verify --timeout 2m
+echo
+sudo -n stress-ng --cache 0 --ignite-cpu --log-brief --metrics-brief --times \
+    --tz --verify --timeout 1m
+echo
+sudo -n stress-ng --cpu 0 --ignite-cpu --log-brief --metrics-brief --times --tz \
+    --verify --timeout 2m
 
=== renamed file 'src/metadataserver/builtin_scripts/stress_ng_memory_long.sh' => 'src/metadataserver/builtin_scripts/stress-ng-memory-long.sh'
--- src/metadataserver/builtin_scripts/stress_ng_memory_long.sh	2017-03-23 18:20:00 +0000
+++ src/metadataserver/builtin_scripts/stress-ng-memory-long.sh	2017-03-29 23:42:47 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # stress_ng_memory_long - Run stress-ng memory tests over 12 hours.
 #
@@ -19,8 +19,18 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-sudo apt-get install -q -y stress-ng
-
-sudo stress-ng \
-     --aggressive -a 0 --class memory --ignite-cpu --log-brief --metrics \
-     --times --tz --verify --timeout 12h
+sudo -n apt-get install -q -y stress-ng
+echo
+
+# Reserve 64M so the test doesn't fail due to the OOM killer.
+total_memory=$(awk '/MemAvailable/ { print ($2 - 65536) }' /proc/meminfo)
+threads=$(lscpu --all --parse | grep -v '#' | wc -l)
+memory_per_thread=$(($total_memory / $threads))
+# stress-ng only allows 4GB of memory per thread.
+if [ $memory_per_thread -ge 4194304 ]; then
+    threads=$(($total_memory / 4194304 + 1))
+    memory_per_thread=$(($total_memory / $threads))
+fi
+
+stress-ng --vm $threads --vm-bytes ${memory_per_thread}k --page-in \
+    --log-brief --metrics-brief --times --tz --verify --timeout 12h
 
=== added file 'src/metadataserver/builtin_scripts/stress-ng-memory-short.sh'
--- src/metadataserver/builtin_scripts/stress-ng-memory-short.sh	1970-01-01 00:00:00 +0000
+++ src/metadataserver/builtin_scripts/stress-ng-memory-short.sh	2017-03-29 23:42:47 +0000
@@ -0,0 +1,36 @@
+#!/bin/bash -e
+#
+# stress-ng-memory-short - Stress test memory for 5 minutes.
+#
+# Author: Lee Trager <[e-mail]>
+#
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+sudo -n apt-get install -q -y stress-ng
+echo
+
+# Reserve 64M so the test doesn't fail due to the OOM killer.
+total_memory=$(awk '/MemAvailable/ { print ($2 - 65536) }' /proc/meminfo)
+threads=$(lscpu --all --parse | grep -v '#' | wc -l)
+memory_per_thread=$(($total_memory / $threads))
+# stress-ng only allows 4GB of memory per thread.
+if [ $memory_per_thread -ge 4194304 ]; then
+    threads=$(($total_memory / 4194304 + 1))
+    memory_per_thread=$(($total_memory / $threads))
+fi
+
+stress-ng --vm $threads --vm-bytes ${memory_per_thread}k --page-in \
+    --log-brief --metrics-brief --times --tz --verify --timeout 5m
 
=== modified file 'src/metadataserver/builtin_scripts/tests/test_builtin_scripts.py'
--- src/metadataserver/builtin_scripts/tests/test_builtin_scripts.py	2017-03-23 18:20:00 +0000
+++ src/metadataserver/builtin_scripts/tests/test_builtin_scripts.py	2017-03-29 23:42:47 +0000
@@ -34,8 +34,7 @@
                 script_in_db.script.comment)
             self.assertItemsEqual(script.tags, script_in_db.tags)
             self.assertEquals(script.script_type, script_in_db.script_type)
-            self.assertEquals(
-                timedelta(seconds=script.timeout), script_in_db.timeout)
+            self.assertEquals(script.timeout, script_in_db.timeout)
             self.assertEquals(script.destructive, script_in_db.destructive)
             self.assertTrue(script_in_db.default)
 
@@ -79,7 +78,8 @@
 
     def test_update_doesnt_revert_script(self):
         load_builtin_scripts()
-        update_script_values = random.choice(BUILTIN_SCRIPTS)
+        update_script_index = random.randint(0, len(BUILTIN_SCRIPTS) - 2)
+        update_script_values = BUILTIN_SCRIPTS[update_script_index]
         script = Script.objects.get(name=update_script_values.name)
         # Put fake new data in to simulate another MAAS region updating
         # to a newer version.
@@ -99,6 +99,14 @@
         script.timeout = user_timeout
         script.save()
 
+        # Test that subsequent scripts still get updated
+        second_update_script_values = BUILTIN_SCRIPTS[update_script_index + 1]
+        second_script = Script.objects.get(
+            name=second_update_script_values.name)
+        # Put fake old data in to simulate updating a script.
+        second_script.title = factory.make_string()
+        second_script.save()
+
         load_builtin_scripts()
         script = reload_object(script)
 
@@ -111,3 +119,7 @@
         self.assertEquals(user_tags, script.tags)
         self.assertEquals(user_timeout, script.timeout)
         self.assertTrue(script.default)
+
+        second_script = reload_object(second_script)
+        self.assertEquals(
+            second_update_script_values.title, second_script.title)
 
=== modified file 'src/metadataserver/user_data/templates/base_user_data.sh'
--- src/metadataserver/user_data/templates/base_user_data.sh	2017-02-16 00:27:35 +0000
+++ src/metadataserver/user_data/templates/base_user_data.sh	2017-03-29 23:42:47 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # This script carries inside it multiple files.  When executed, it creates
 # the files into a temporary directory and uses them to execute commands
 
=== modified file 'src/metadataserver/user_data/templates/snippets/maas_enlist.sh'
--- src/metadataserver/user_data/templates/snippets/maas_enlist.sh	2017-03-08 10:10:12 +0000
+++ src/metadataserver/user_data/templates/snippets/maas_enlist.sh	2017-03-29 23:42:47 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 #    maas-enlist: MAAS Enlistment Tool
 #
 
=== modified file 'src/metadataserver/user_data/templates/snippets/maas_run_remote_scripts.py'
--- src/metadataserver/user_data/templates/snippets/maas_run_remote_scripts.py	2017-03-03 00:50:43 +0000
+++ src/metadataserver/user_data/templates/snippets/maas_run_remote_scripts.py	2017-03-29 23:42:47 +0000
@@ -233,6 +233,12 @@
         fail("URL must be provided either in --url or in config\n")
     url = "%s/%s/" % (url, args.apiver)
 
+    # Disable the OOM killer on the runner process, the OOM killer will still
+    # go after any tests spawned.
+    oom_score_adj_path = os.path.join(
+        '/proc', str(os.getpid()), 'oom_score_adj')
+    open(oom_score_adj_path, 'w').write('-1000')
+
     heart_beat = HeartBeat(url, creds)
     heart_beat.start()
 
 
=== modified file 'src/provisioningserver/refresh/node_info_scripts.py'
--- src/provisioningserver/refresh/node_info_scripts.py	2017-03-29 21:13:51 +0000
+++ src/provisioningserver/refresh/node_info_scripts.py	2017-03-29 23:42:47 +0000
@@ -60,19 +60,19 @@
 
 # Built-in script to run lshw.
 LSHW_SCRIPT = dedent("""\
-    #!/bin/sh
+    #!/bin/bash
     sudo -n /usr/bin/lshw -xml
     """)
 
 # Built-in script to run `ip addr`
 IPADDR_SCRIPT = dedent("""\
-    #!/bin/sh
+    #!/bin/bash
     ip addr
     """)
 
 # Built-in script to detect virtual instances.
 VIRTUALITY_SCRIPT = dedent("""\
-    #!/bin/sh
+    #!/bin/bash
     # In Bourne Shell `type -p` does not work; `which` is closest.
     if which systemd-detect-virt > /dev/null; then
         # systemd-detect-virt prints "none" and returns nonzero if
@@ -90,7 +90,7 @@
     """)
 
 CPUINFO_SCRIPT = dedent("""\
-    #!/bin/sh
+    #!/bin/bash
     # Gather the standard output as it has some extra info
     lscpu
     # Gather the machine readable output for processing
@@ -108,7 +108,7 @@
     """)
 
 SRIOV_SCRIPT = dedent("""\
-    #!/bin/sh
+    #!/bin/bash
     for file in $(find /sys/devices/ -name sriov_numvfs); do
         dir=$(dirname "$file")
         for eth in $(ls "$dir/net/"); do
@@ -388,7 +388,7 @@
 
 LIST_MODALIASES_OUTPUT_NAME = '00-maas-04-list-modaliases'
 LIST_MODALIASES_SCRIPT = dedent("""\
-    #!/bin/sh
+    #!/bin/bash
     find /sys -name modalias -print0 | xargs -0 cat | sort -u
     """)
 
 
=== modified file 'src/provisioningserver/refresh/tests/test_node_info_scripts.py'
--- src/provisioningserver/refresh/tests/test_node_info_scripts.py	2017-03-23 18:20:00 +0000
+++ src/provisioningserver/refresh/tests/test_node_info_scripts.py	2017-03-29 23:42:47 +0000
@@ -944,7 +944,7 @@
         self.sysdv.unlink()
         sysdv_name = factory.make_name("virt")
         with self.sysdv.open("w") as fd:
-            fd.write("#!/bin/sh\n")
+            fd.write("#!/bin/bash\n")
             fd.write("echo %s\n" % sysdv_name)
             fd.write("exit 1\n")
         self.sysdv.chmod(0o700)
 
=== modified file 'src/provisioningserver/refresh/tests/test_refresh.py'
--- src/provisioningserver/refresh/tests/test_refresh.py	2017-03-03 00:50:43 +0000
+++ src/provisioningserver/refresh/tests/test_refresh.py	2017-03-29 23:42:47 +0000
@@ -137,7 +137,7 @@
         if script_name is None:
             script_name = factory.make_name('script_name')
         TEST_SCRIPT = dedent("""\
-            #!/bin/sh
+            #!/bin/bash
             echo 'test script'
             """)
         refresh.NODE_INFO_SCRIPTS = OrderedDict([
@@ -151,7 +151,7 @@
         if script_name is None:
             script_name = factory.make_name('script_name')
         TEST_SCRIPT = dedent("""\
-            #!/bin/sh
+            #!/bin/bash
             echo 'test failed'
             exit 1
             """)
 
=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2017-03-27 14:35:23 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2017-03-29 23:42:47 +0000
@@ -2479,7 +2479,7 @@
     @inlineCallbacks
     def test_spawnProcessAndNullifyStdout_nullifies_stdout(self):
         done, protocol = makeDeferredWithProcessProtocol()
-        args = [b"/bin/sh", b'-c', b"echo foo"]
+        args = [b"/bin/bash", b'-c', b"echo foo"]
         outReceived = Mock()
         protocol.outReceived = outReceived
         spawnProcessAndNullifyStdout(protocol, args)
@@ -2489,7 +2489,7 @@
     @inlineCallbacks
     def test_spawnProcessAndNullifyStdout_captures_stderr(self):
         done, protocol = makeDeferredWithProcessProtocol()
-        args = [b"/bin/sh", b'-c', b"echo foo >&2"]
+        args = [b"/bin/bash", b'-c', b"echo foo >&2"]
         errReceived = Mock()
         protocol.errReceived = errReceived
         spawnProcessAndNullifyStdout(protocol, args)
@@ -2500,7 +2500,7 @@
     def test_executeScanNetworksSubprocess(self):
         mock_scan_args = self.patch(
             clusterservice, 'get_scan_all_networks_args')
-        mock_scan_args.return_value = [b"/bin/sh", b'-c', b"echo -n foo >&2"]
+        mock_scan_args.return_value = [b"/bin/bash", b'-c', b"echo -n foo >&2"]
         mock_log_msg = self.patch(clusterservice.log, 'msg')
         d = executeScanNetworksSubprocess()
         yield d