Skip to content

Commit 3164053

Browse files
juliakregerjuliakreger
committed
Fix gate and bump CoreOS version to latest stable.
Increases the amount of ram for CoreOS IPA to 2GB as the base CoreOS image is now 310MB. Bumped CPU count for CoreOS runs to 2 CPUs as the concurrency helps boot times for the CoreOS ramdisk. Adds netbase, udev, and open-iscsi to debian jessie container as they are no longer present in the default container. Explicitly set path variable for execution in the debian container as udevadm is in /sbin, and we may not have /sbin on the path that is passed through to the chroot. Also fixed new pep8 test failures. Story: #1600228 Task: #16287 Change-Id: I488445dfd261b7bca322a0be7b4d8ca6105750a3
1 parent 2df41a8 commit 3164053

15 files changed

Lines changed: 309 additions & 234 deletions

File tree

‎Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ RUN echo 'deb http://http.us.debian.org/debian jessie-backports main' > /etc/apt
2323
# image on disk
2424
RUN proxy.sh apt-get update && \
2525
proxy.sh apt-get -y upgrade && \
26-
proxy.sh apt-get install -y --no-install-recommends gdisk python2.7 python2.7-dev \
27-
python-pip qemu-utils parted hdparm util-linux genisoimage git gcc \
28-
bash coreutils tgt dmidecode ipmitool psmisc dosfstools bsdmainutils && \
26+
proxy.sh apt-get install -y --no-install-recommends netbase gdisk \
27+
python2.7 python2.7-dev python-pip qemu-utils parted hdparm \
28+
util-linux genisoimage git gcc bash coreutils tgt dmidecode \
29+
ipmitool psmisc dosfstools bsdmainutils open-iscsi udev && \
2930
proxy.sh apt-get --only-upgrade -t jessie-backports install -y qemu-utils
3031

3132
# Some cleanup

‎imagebuild/coreos/coreos-oem-inject.py‎

Lines changed: 265 additions & 206 deletions
Large diffs are not rendered by default.

‎imagebuild/coreos/oem/cloud-config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ coreos:
258258
ExecStartPre=-/usr/sbin/modprobe ipmi_devintf
259259
ExecStartPre=-/usr/sbin/modprobe ipmi_si
260260
ExecStart=/usr/bin/chroot /opt/ironic-python-agent \
261+
env PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH \
261262
/usr/local/bin/ironic-python-agent
262263
ExecStopPost=/usr/share/oem/finalize_rescue.sh
263264
Restart=on-failure

‎imagebuild/coreos/version.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
COREOS_BUILD=1068
2-
COREOS_BRANCH=10
3-
COREOS_PATCH=0
4-
COREOS_VERSION=1068.10.0
5-
COREOS_VERSION_ID=1068.10.0
6-
COREOS_BUILD_ID="2016-08-23-0220"
7-
COREOS_SDK_VERSION=1068.9.0
1+
COREOS_BUILD=1688
2+
COREOS_BRANCH=5
3+
COREOS_PATCH=3
4+
COREOS_VERSION=1688.5.3
5+
COREOS_VERSION_ID=1688.5.3
6+
COREOS_BUILD_ID="2018-04-03-0540"
7+
COREOS_SDK_VERSION=1688.5.2

‎ironic_python_agent/api/controllers/v1/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,5 @@ def get(self):
114114
# the request object to make the links.
115115
return V1.convert()
116116

117+
117118
__all__ = (Controller)

‎ironic_python_agent/api/controllers/v1/base.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ class MultiType(wtypes.UserType):
4545
4646
Used for validating that a value is an instance of one of the types.
4747
48-
:param \*types: Variable-length list of types.
48+
:param types: Variable-length list of types.
4949
5050
"""
51+
5152
def __init__(self, *types):
5253
self.types = types
5354

‎ironic_python_agent/config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
cfg.StrOpt('api_url',
2727
default=APARAMS.get('ipa-api-url'),
2828
deprecated_name='api-url',
29-
regex='^http(s?):\/\/.+',
29+
regex='^http(s?):\\/\\/.+',
3030
help='URL of the Ironic API. '
3131
'Can be supplied as "ipa-api-url" kernel parameter.'
3232
'The value must start with either http:// or https://.'),

‎ironic_python_agent/extensions/standby.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ def _message_format(msg, image_info, device, partition_uuids):
144144
root_uuid = partition_uuids.get('root uuid')
145145
efi_system_partition_uuid = (
146146
partition_uuids.get('efi system partition uuid'))
147-
if (image_info.get('deploy_boot_mode') == 'uefi' and
148-
image_info.get('boot_option') == 'local'):
147+
if (image_info.get('deploy_boot_mode') == 'uefi'
148+
and image_info.get('boot_option') == 'local'):
149149
result_msg = msg + 'root_uuid={} efi_system_partition_uuid={}'
150150
message = result_msg.format(image_info['id'], device,
151151
root_uuid,
@@ -461,8 +461,8 @@ def prepare_image(self,
461461
LOG.debug('Already had %s cached, overwriting',
462462
self.cached_image_id)
463463

464-
if (stream_raw_images and disk_format == 'raw' and
465-
image_info.get('image_type') != 'partition'):
464+
if (stream_raw_images and disk_format == 'raw'
465+
and image_info.get('image_type') != 'partition'):
466466
self._stream_raw_image_onto_device(image_info, device)
467467
else:
468468
self._cache_and_write_image(image_info, device)

‎ironic_python_agent/hardware_managers/mlnx.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ def _detect_hardware():
6262
"""
6363
iface_names = os.listdir('/sys/class/net')
6464
for ifname in iface_names:
65-
if (hardware._get_device_info(ifname, 'net', 'vendor') ==
66-
MLNX_VENDOR_ID):
65+
if (hardware._get_device_info(
66+
ifname, 'net', 'vendor') == MLNX_VENDOR_ID):
6767
return True
6868
return False
6969

@@ -96,8 +96,8 @@ def get_interface_info(self, interface_name):
9696
if address is None:
9797
raise errors.IncompatibleHardwareMethodError()
9898
vendor = hardware._get_device_info(interface_name, 'net', 'vendor')
99-
if (len(address) != netutils.INFINIBAND_ADDR_LEN or
100-
vendor != MLNX_VENDOR_ID):
99+
if (len(address) != netutils.INFINIBAND_ADDR_LEN
100+
or vendor != MLNX_VENDOR_ID):
101101
raise errors.IncompatibleHardwareMethodError()
102102

103103
mac_addr = _infiniband_address_to_mac(address)

‎ironic_python_agent/tests/functional/base.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ def setUp(self):
6565
time.sleep(sleep_time)
6666
tries += 1
6767

68-
raise IOError('Agent did not start after %s seconds.' % (max_tries *
69-
sleep_time))
68+
raise IOError('Agent did not start after %s seconds.'
69+
% (max_tries * sleep_time))
7070

7171
def request(self, method, path, expect_error=None, expect_json=True,
7272
**kwargs):

0 commit comments

Comments
 (0)