teuthology 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl

teuthology/openstack/setup-openstack.sh

@@ -41,6 +41,8 @@ function create_config() {
     local server_group="${11}"
     local worker_group="${12}"
     local package_repo="${13}"
+    local teuthology_branch="${14}"
+    local teuthology_git_url="${15}"
 
     if test "$network" ; then
         network="network: $network"
@@ -65,6 +67,8 @@ queue_host: localhost
 lab_domain: $labdomain
 max_job_time: 32400 # 9 hours
 teuthology_path: .
+teuthology_branch: $teuthology_branch
+teuthology_git_url: $teuthology_git_url
 canonical_tags: $canonical_tags
 openstack:
   clone: git clone http://github.com/ceph/teuthology
@@ -113,13 +117,23 @@ function apt_get_update() {
 }
 
 function setup_docker() {
-    if test -f /etc/apt/sources.list.d/docker.list ; then
-        echo "OK docker is installed"
-    else
-        sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-        echo deb https://apt.dockerproject.org/repo ubuntu-trusty main | sudo tee -a /etc/apt/sources.list.d/docker.list
-        sudo apt-get -qq install -y docker-engine
+    source /etc/os-release
+    if ! $VERSION_CODENAME; then
+        echo "ERROR: VERSION_CODENAME is not set. Cannot proceed with Docker installation."
+        return
+    fi
+    if !command -v docker &> /dev/null; then
+        curl -fsSL https://download.docker.com/linux/ubuntu/gpg | \
+            sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+        echo \
+          "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] \
+          https://download.docker.com/linux/ubuntu $VERSION_CODENAME stable" | \
+          sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+        sudo apt-get update
+        sudo apt-get install -y docker-ce docker-ce-cli containerd.io
         echo "INSTALLED docker"
+    else
+        echo "OK docker is installed"
     fi
 }
 
@@ -163,7 +177,7 @@ function setup_paddles() {
         git clone https://github.com/ceph/paddles.git $paddles_dir || return 1
     fi
 
-    sudo apt-get -qq install -y --force-yes beanstalkd postgresql postgresql-contrib postgresql-server-dev-all supervisor
+    sudo apt-get -qq install -y beanstalkd postgresql postgresql-contrib postgresql-server-dev-all supervisor
 
     if ! sudo /etc/init.d/postgresql status ; then
         sudo mkdir -p /etc/postgresql
@@ -179,10 +193,10 @@ function setup_paddles() {
         cd $paddles_dir || return 1
         git pull --rebase
         git clean -ffqdx
-        sed -e "s|^address.*|address = 'http://localhost'|" \
-            -e "s|^job_log_href_templ = 'http://qa-proxy.ceph.com/teuthology|job_log_href_templ = 'http://$public_ip|" \
+        sed -e "/^address = os.environ.get(/,/^)/c\address = os.environ.get('PADDLES_ADDRESS', 'http://localhost')" \
+            -e "s|^job_log_href_templ = os.environ.get(.*)|job_log_href_templ = os.environ.get('PADDLES_JOB_LOG_HREF_TEMPL', 'http://$public_ip')|" \
             -e "/sqlite/d" \
-            -e "s|.*'postgresql+psycop.*'|'url': 'postgresql://paddles:paddles@localhost/paddles'|" \
+            -e "s|^ *'url':.*|'url': 'postgresql://paddles:paddles@localhost/paddles',|" \
             -e "s/'host': '127.0.0.1'/'host': '0.0.0.0'/" \
             < config.py.in > config.py
         virtualenv ./virtualenv
@@ -258,7 +272,7 @@ function setup_pulpito() {
         git clone https://github.com/ceph/pulpito.git $pulpito_dir || return 1
     fi
 
-    sudo apt-get -qq install -y --force-yes nginx
+    sudo apt-get -qq install -y nginx
     local nginx_conf=/etc/nginx/sites-available/default
     sudo sed -i '/text\/plain/a\    text\/plain                            log;' \
         /etc/nginx/mime.types
@@ -278,7 +292,7 @@ function setup_pulpito() {
         virtualenv ./virtualenv
         source ./virtualenv/bin/activate
         pip install --upgrade pip
-        pip install 'setuptools==18.2.0'
+        pip install 'setuptools>=58.0.0'
         pip install -r requirements.txt
         python run.py &
     )
@@ -408,7 +422,7 @@ function setup_dnsmasq() {
 
     if ! test -f /etc/dnsmasq.d/resolv ; then
         resolver=$(grep nameserver /etc/resolv.conf | head -1 | perl -ne 'print $1 if(/\s*nameserver\s+([\d\.]+)/)')
-        sudo apt-get -qq install -y --force-yes dnsmasq resolvconf
+        sudo apt-get -qq install -y dnsmasq resolvconf
         # FIXME: this opens up dnsmasq to DNS reflection/amplification attacks, and can be reverted
         # FIXME: once we figure out how to configure dnsmasq to accept DNS queries from all subnets
         sudo perl -pi -e 's/--local-service//' /etc/init.d/dnsmasq
@@ -500,22 +514,27 @@ function remove_images() {
 }
 
 function install_packages() {
-
-    if ! test -f /etc/apt/sources.list.d/trusty-backports.list ; then
-        echo deb http://archive.ubuntu.com/ubuntu trusty-backports main universe | sudo tee /etc/apt/sources.list.d/trusty-backports.list
+    source /etc/os-release
+    if ! $VERSION_CODENAME; then
+        echo "ERROR: VERSION_CODENAME is not set. Cannot proceed with Docker installation."
+        return
+    fi
+    local codename=$VERSION_CODENAME
+    local backports_file="/etc/apt/sources.list.d/${codename}-backports.list"
+    if [ ! -f "$backports_file" ]; then
+        echo "Adding backports repo for $codename..."
+        echo "deb http://archive.ubuntu.com/ubuntu ${codename}-backports main universe" | sudo tee "$backports_file"
         sudo apt-get update
     fi
-
-    local packages="jq realpath curl"
-    sudo apt-get -qq install -y --force-yes $packages
-
+    local packages="jq curl"
+    sudo apt-get -qq install -y $packages
     echo "INSTALL required packages $packages"
 }
 
 CAT=${CAT:-cat}
 
 function verify_openstack() {
-    if ! openstack server list > /dev/null ; then
+    if ! openstack server list --format json > /dev/null ; then
         echo ERROR: the credentials from ~/openrc.sh are not working >&2
         return 1
     fi
@@ -701,13 +720,14 @@ function main() {
     # assume the first available IPv4 subnet is going to be used to assign IP to the instance
     #
     [ -z "$network" ] && {
-        local default_subnets=$(openstack subnet list --ip-version 4 -f json | jq -r '.[] | .Subnet' | sort | uniq)
+        local default_subnets=$(openstack subnet list --ip-version 4 -f json | jq -r '.[] | select(.Name != null) | .Subnet' | sort | uniq)
     } || {
         local network_id=$(openstack network list -f json | jq -r ".[] | select(.Name == \"$network\") | .ID")
         local default_subnets=$(openstack subnet list --ip-version 4 -f json \
             | jq -r ".[] | select(.Network == \"$network_id\") | .Subnet" | sort | uniq)
     }
     subnets=$(echo $subnets $default_subnets)
+    echo "subnets: $subnets"
 
     case $provider in
         entercloudsuite)
@@ -720,16 +740,21 @@ function main() {
     esac
 
     local ip
-    for dev in eth0 ens3 ; do
-        ip=$(ip a show dev $dev 2>/dev/null | sed -n "s:.*inet \(.*\)/.*:\1:p")
-        test "$ip" && break
+    for dev in $(ip -o link show | awk -F': ' '{print $2}' | grep -v '^lo$'); do
+        ip=$(ip -4 addr show dev "$dev" | awk '/inet / {print $2}' | cut -d/ -f1)
+        if [ -n "$ip" ]; then
+            nameserver="$ip"
+            break
+        fi
     done
-    : ${nameserver:=$ip}
+
+    local teuthology_branch="$(git -C $(dirname $0)/../../../teuthology rev-parse --abbrev-ref HEAD)"
+    local teuthology_git_url="$(git -C $(dirname $0)/../../../teuthology config --get remote.origin.url)"
 
     if $do_create_config ; then
         create_config "$network" "$subnets" "$nameserver" "$labdomain" "$ip" \
             "$archive_upload" "$canonical_tags" "$selfname" "$keypair" \
-            "$server_name" "$server_group" "$worker_group" "$package_repo" || return 1
+            "$server_name" "$server_group" "$worker_group" "$package_repo" "$teuthology_branch" "$teuthology_git_url" || return 1
         setup_ansible "$subnets" $labdomain || return 1
         setup_ssh_config || return 1
         setup_authorized_keys || return 1

teuthology/orchestra/opsys.py

@@ -34,6 +34,16 @@ DISTRO_CODENAME_MAP = {
         "7": "maipo",
         "6": "santiago",
     },
+    "alma": {
+        "8.10": "alma",
+        "9.6": "alma",
+        "10.0": "alma",
+    },
+    "rocky": {
+        "8.10": "rocky",
+        "9.6": "rocky",
+        "10.0": "rocky",
+    },
     "centos": {
         "10": "stream",
         "9": "stream",
@@ -53,6 +63,7 @@ DISTRO_CODENAME_MAP = {
         "20": "heisenbug",
     },
     "opensuse": {
+        "1.0": "tumbleweed",
         "15.0": "leap",
         "15.1": "leap",
         "15.2": "leap",
@@ -82,6 +93,8 @@ DEFAULT_OS_VERSION = dict(
     opensuse="15.4",
     sle="15.2",
     rhel="8.6",
+    rocky="9.6",
+    alma="9.6",
     debian='8.0'
 )
 
@@ -187,6 +200,8 @@ class OS(object):
         elif name == 'centos':
             if parse_version(version) >= Version("8.0"):
                 version = f"{version}.stream"
+        elif name == 'almalinux':
+            name = 'alma'
         obj = cls(name=name, version=version)
         return obj
 

teuthology/orchestra/remote.py

@@ -265,10 +265,13 @@ class RemoteShell(object):
 
 
     def write_file(self, path, data, sudo=False, mode=None, owner=None,
-                                     mkdir=False, append=False):
+                                     mkdir=False, append=False, bs=None,
+                                     offset=None, sync=False):
         """
         Write data to remote file
 
+        The data written in 512-byte blocks, provide `bs` to use bigger blocks.
+
         :param path:    file path on remote host
         :param data:    str, binary or fileobj to be written
         :param sudo:    use sudo to write file, defaults False
@@ -276,11 +279,20 @@ class RemoteShell(object):
         :param owner:   set file owner if provided
         :param mkdir:   preliminary create the file directory, defaults False
         :param append:  append data to the file, defaults False
+        :param bs:      write up to N bytes at a time if provided, default is 512 in `dd`
+        :param offset:  number of bs blocks to seek to in file, defaults 0
+        :param sync:    sync file after write is complete if provided
         """
         dd = 'sudo dd' if sudo else 'dd'
         args = dd + ' of=' + path
         if append:
             args += ' conv=notrunc oflag=append'
+        if bs:
+            args += ' bs=' + str(bs)
+        if offset:
+            args += ' seek=' + str(offset)
+        if sync:
+            args += ' conv=sync'
         if mkdir:
             mkdirp = 'sudo mkdir -p' if sudo else 'mkdir -p'
             dirpath = os.path.dirname(path)
@@ -396,7 +408,7 @@ class Remote(RemoteShell):
             self.ssh.close()
         if not timeout:
             return self._reconnect(timeout=socket_timeout)
-        action = "reconnect to {self.shortname}"
+        action = f"reconnect to {self.shortname}"
         with safe_while(action=action, timeout=timeout, increment=3, _raise=False) as proceed:
             success = False
             while proceed():
@@ -449,6 +461,46 @@ class Remote(RemoteShell):
                 return
         raise RuntimeError("Could not determine interface/CIDR!")
 
+
+    def resolve_ip(self, name=None, ipv='4') -> str:
+        """
+        Resolve IP address of the remote host via remote host
+
+        Because remote object maybe behind bastion host we need
+        the remote host address resolvable from remote side.
+        So in order to the ip address we just call `host` remotely
+        and parse output like:
+            'smithi001.front.sepia.ceph.com has address 172.21.15.1\n'
+
+        :param name:    hostname to resolve, by defaults remote host itself.
+        :param ipv:     the IP version, 4 or 6, defaults to 4.
+
+        :raises:    :class:`Exception`: when the hostname cannot be resolved.
+        :raises:    :class:`ValueError`: when the ipv argument mismatch 4 or 6.
+
+        :returns:   str object, the ip addres of the remote host.
+        """
+        hostname = name or self.hostname
+        version = str(ipv)
+        if version in ['4', '6']:
+            remote_host_ip = self.sh(f'host -{ipv} {hostname}')
+        else:
+            raise ValueError(f'Unknown IP version {ipv}, expected 4 or 6')
+        # `host -4` or `host -6` may have multiline output: a host can have
+        # several address; thus try and find the first suitable
+        for info in remote_host_ip.split("\n"):
+            if version == '4' and 'has address' in info:
+                (host, ip) = info.strip().split(' has address ')
+                if hostname in host:
+                    return ip
+            elif version == '6' and 'has IPv6 address' in info:
+                (host, ip) = info.strip().split(' has IPv6 address ')
+                if hostname in host:
+                    return ip
+        else:
+            raise Exception(f'Cannot get IPv{ipv} address for the host "{hostname}" via remote "{self.hostname}"')
+
+
     @property
     def hostname(self):
         if not hasattr(self, '_hostname'):

teuthology/orchestra/run.py

@@ -242,15 +242,21 @@ class Raw(object):
 
 def quote(args):
     """
-    Internal quote wrapper.
+    Internal quote wrapper. None arguments are not allowed.
+
+    :param args: list of str or Raw objects
+
+    :raises: :class:`RuntimeError`: if one of the args is None.
     """
     def _quote(args):
         """
         Handle quoted string, testing for raw charaters.
         """
-        for a in args:
+        for i, a in enumerate(args):
             if isinstance(a, Raw):
                 yield a.value
+            elif a is None:
+                raise RuntimeError(f"Argument at position {i} is None: {args}")
             else:
                 yield shlex.quote(a)
     if isinstance(args, list):

teuthology/provision/downburst.py

@@ -14,6 +14,15 @@ from teuthology.lock import query
 log = logging.getLogger(__name__)
 
 
+def get_types():
+    types = ['vps']
+    if 'downburst' in config and 'machine' in config.downburst:
+        machine = config.downburst.get('machine')
+        if isinstance(machine, list):
+            types = list(m.get('type') for m in machine)
+    return types
+
+
 def downburst_executable():
     """
     First check for downburst in the user's path.
@@ -107,8 +116,9 @@ class Downburst(object):
                         self.destroy()
                     else:
                         success = False
-                        log.info("Downburst failed on %s: %s" % (
-                            self.name, stderr.strip()))
+                        log.error("Downburst failed on %s" % self.name)
+                        for i in stderr.split('\n'):
+                            log.error(f">>> {i}")
                         break
             return success
 
@@ -185,24 +195,32 @@ class Downburst(object):
         os_version = self.os_version.lower()
 
         mac_address = self.status['mac_address']
-        defaults = dict(
-            downburst=dict(
-                machine=dict(
-                    disk=os.environ.get('DOWNBURST_DISK_SIZE', '100G'),
-                    ram=os.environ.get('DOWNBURST_RAM_SIZE', '3.8G'),
-                    cpus=int(os.environ.get('DOWNBURST_CPUS', 1)),
-                    volumes=dict(
-                        count=int(os.environ.get('DOWNBURST_EXTRA_DISK_NUMBER', 4)),
-                        size=os.environ.get('DOWNBURST_EXTRA_DISK_SIZE', '100G'),
-                    ),
-                ),
-            )
+        machine = dict(
+            disk=os.environ.get('DOWNBURST_DISK_SIZE', '100G'),
+            ram=os.environ.get('DOWNBURST_RAM_SIZE', '3.8G'),
+            cpus=int(os.environ.get('DOWNBURST_CPUS', 1)),
+            volumes=dict(
+                count=int(os.environ.get('DOWNBURST_EXTRA_DISK_NUMBER', 4)),
+                size=os.environ.get('DOWNBURST_EXTRA_DISK_SIZE', '100G'),
+            ),
         )
-        downburst_config = defaults['downburst']
-        if config.downburst and isinstance(config.downburst, dict):
-            deep_merge(downburst_config, config.downburst)
-        log.debug('downburst_config: %s', downburst_config)
-        machine = downburst_config['machine']
+        def belongs_machine_type(machine_config: dict, machine_type: str) -> bool:
+            if isinstance(machine_config, dict):
+                t = machine_config.get('type', None)
+                if isinstance(t, str):
+                    return machine_type == t
+                elif isinstance(t, list):
+                    return machine_type in t
+            return False
+        if isinstance(config.downburst, dict) and isinstance(config.downburst.get('machine'), list):
+            machine_type = self.status['machine_type']
+            machine_config = next((m for m in config.downburst.get('machine')
+                        if belongs_machine_type(m, machine_type)), None)
+            if machine_config is None:
+                raise RuntimeError(f"Cannot find config for machine type {machine_type}.")
+        elif isinstance(config.downburst, dict) and isinstance(config.downburst.get('machine'), dict):
+            machine_config = config.downburst.get('machine')
+        deep_merge(machine, machine_config)
         log.debug('Using machine config: %s', machine)
         file_info = {
             'disk-size': machine['disk'],
@@ -245,18 +263,30 @@ class Downburst(object):
             'git',
             'wget',
         ])
+        if os_type in ('centos', 'opensuse'):
+            user_info['packages'].extend([
+                'chrony',
+            ])
+        if os_type in ('ubuntu', 'debian'):
+            user_info['packages'].extend([
+                'ntp',
+            ])
+
         # On CentOS/RHEL/Fedora, write the correct mac address and
-        # install redhab-lsb-core for `lsb_release`
         if os_type in ['centos', 'rhel', 'fedora']:
             user_info['runcmd'].extend([
                 ['sed', '-ie', 's/HWADDR=".*"/HWADDR="%s"/' % mac_address,
                  '/etc/sysconfig/network-scripts/ifcfg-eth0'],
             ])
-            user_info['packages'].append('redhat-lsb-core')
         # On Ubuntu, starting with 16.04, and Fedora, starting with 24, we need
         # to install 'python' to get python2.7, which ansible needs
         if os_type in ('ubuntu', 'fedora'):
             user_info['packages'].append('python')
+        if os_type in ('centos'):
+            user_info['packages'].extend([
+                'python3-pip',
+                'bind-utils',
+            ])
         user_fd = tempfile.NamedTemporaryFile(delete=False, mode='wt')
         user_str = "#cloud-config\n" + yaml.safe_dump(user_info)
         user_fd.write(user_str)
@@ -281,43 +311,54 @@ class Downburst(object):
         self.remove_config()
 
 
+_known_downburst_distros = {
+    'rhel_minimal': ['6.4', '6.5'],
+    'centos': ['9.stream', '10.stream'],
+    'centos_minimal': ['6.4', '6.5'],
+    'debian': ['6.0', '7.0', '7.9', '8.0'],
+    'fedora': ['41', '42'],
+    'opensuse': ['1.0(tumbleweed)',
+                 '15.5(leap)', '15.6(leap)',
+                 '16.0(leap)',
+        ],
+    'sles': ['12-sp3', '15-sp1', '15-sp2'],
+    'alma': ['10.0', '8.10', '9.6'],
+    'rocky': ['10.0', '8.10', '9.6'],
+    'ubuntu': ['20.04(focal)', '20.10(groovy)',
+               '21.04(hirsute)', '21.10(impish)',
+               '22.04(jammy)', '22.10(kinetic)',
+               '23.04(lunar)', '23.10(mantic)',
+               '24.04(noble)', '24.10(oracular)',
+               '25.04(plucky)',
+        ],
+}
+
 def get_distro_from_downburst():
     """
     Return a table of valid distros.
 
     If downburst is in path use it.  If either downburst is unavailable,
     or if downburst is unable to produce a json list, then use a default
-    table.
+    table or a table from previous successful call.
     """
-    default_table = {'rhel_minimal': ['6.4', '6.5'],
-                     'fedora': ['17', '18', '19', '20', '22'],
-                     'centos': ['6.3', '6.4', '6.5', '7.0',
-				 '7.2', '7.4', '8.2'],
-                     'centos_minimal': ['6.4', '6.5'],
-                     'ubuntu': ['8.04(hardy)', '9.10(karmic)',
-                                 '10.04(lucid)', '10.10(maverick)',
-                                 '11.04(natty)', '11.10(oneiric)',
-                                 '12.04(precise)', '12.10(quantal)',
-                                 '13.04(raring)', '13.10(saucy)',
-                                 '14.04(trusty)', 'utopic(utopic)',
-                                 '16.04(xenial)', '18.04(bionic)',
-                                 '20.04(focal)'],
-                     'sles': ['12-sp3', '15-sp1', '15-sp2'],
-                     'opensuse': ['12.3', '15.1', '15.2'],
-                     'debian': ['6.0', '7.0', '8.0']}
+    # because sometimes downburst fails to complete list-json
+    # due to temporary issues with vendor site accessibility
+    # we cache known downburst distros from previous call
+    # to be reused in such cases of outage
+    global _known_downburst_distros
     executable_cmd = downburst_executable()
     environment_dict = downburst_environment()
     if not executable_cmd:
         log.warning("Downburst not found!")
         log.info('Using default values for supported os_type/os_version')
-        return default_table
+        return _known_downburst_distros
     try:
         log.debug(executable_cmd)
         output = subprocess.check_output([executable_cmd, 'list-json'],
                                                         env=environment_dict)
-        downburst_data = json.loads(output)
-        return downburst_data
+        _known_downburst_distros = json.loads(output)
+        return _known_downburst_distros
     except (subprocess.CalledProcessError, OSError):
         log.exception("Error calling downburst!")
-        log.info('Using default values for supported os_type/os_version')
-        return default_table
+        log.info('Using default values for supported os_type/os_version or values from previous call...')
+        return _known_downburst_distros

teuthology/provision/fog.py

@@ -119,8 +119,8 @@ class FOG(object):
         )
         prepped = req.prepare()
         resp = requests.Session().send(prepped)
-        if not resp.ok and resp.text:
-            self.log.error("%s: %s", resp.status_code, resp.text)
+        if not resp.ok:
+            self.log.error(f"Got status {resp.status_code} from {url_suffix}: '{resp.text}'")
         if verify:
             resp.raise_for_status()
         return resp

teuthology/repo_utils.py

@@ -51,6 +51,8 @@ def build_git_url(project, project_owner='ceph'):
         base = config.get_ceph_cm_ansible_git_url()
     elif project == 'ceph':
         base = config.get_ceph_git_url()
+    elif project == 'teuthology':
+        base = config.get_teuthology_git_url()
     else:
         base = 'https://github.com/{project_owner}/{project}'
     url_templ = re.sub(r'\.git$', '', base)
@@ -435,7 +437,7 @@ def fetch_teuthology(branch, commit=None, lock=True):
     :param commit: The sha1 to checkout. Defaults to None, which uses HEAD of the branch.
     :returns:      The destination path
     """
-    url = config.ceph_git_base_url + 'teuthology.git'
+    url = config.get_teuthology_git_url()
     return fetch_repo(url, branch, commit, bootstrap_teuthology, lock)
 
 

teuthology/run.py

@@ -402,7 +402,7 @@ def main(args):
     # FIXME this should become more generic, and the keys should use
     # '_' uniformly
     if fake_ctx.config.get('interactive-on-error'):
-        teuth_config.config.ctx = fake_ctx
+        teuth_config.ctx = fake_ctx
 
     try:
         run_tasks(tasks=config['tasks'], ctx=fake_ctx)

teuthology/scrape.py

@@ -3,7 +3,7 @@
 
 import difflib
 from errno import ENOENT
-from gzip import GzipFile
+import gzip
 import sys
 import os
 import yaml
@@ -361,6 +361,8 @@ class Job(object):
             return
 
         for line in grep(tlog_path, "command crashed with signal"):
+            if not line:
+                continue
             log.debug("Found a crash indication: {0}".format(line))
             # tasks.ceph.osd.1.plana82.stderr
             match = re.search(r"tasks.ceph.([^\.]+).([^\.]+).([^\.]+).stderr", line)
@@ -387,7 +389,8 @@ class Job(object):
                 ))
                 continue
 
-            bt, ass = self._search_backtrace(GzipFile(gzipped_log_path))
+            with gzip.open(gzipped_log_path, 'rt',  errors='ignore') as f:
+                bt, ass = self._search_backtrace(f)
             if ass and not self.assertion:
                 self.assertion = ass
             if bt:

teuthology/suite/merge.py

@@ -5,6 +5,7 @@ import os
 from types import MappingProxyType
 import yaml
 
+from teuthology.config import JobConfig
 from teuthology.suite.build_matrix import combine_path
 from teuthology.suite.util import strip_fragment_path
 from teuthology.misc import deep_merge
@@ -115,6 +116,7 @@ def config_merge(configs, suite_name=None, **kwargs):
     the entire job (config) from the list.
     """
     seed = kwargs.setdefault('seed', 1)
+    base_config = kwargs.setdefault('base_config', JobConfig())
     if not isinstance(seed, int):
         log.debug("no valid seed input: using 1")
         seed = 1
@@ -128,7 +130,7 @@ def config_merge(configs, suite_name=None, **kwargs):
         if suite_name is not None:
             desc = combine_path(suite_name, desc)
 
-        yaml_complete_obj = {}
+        yaml_complete_obj = copy.deepcopy(base_config.to_dict())
         deep_merge(yaml_complete_obj, dict(TEUTHOLOGY_TEMPLATE))
         for path in paths:
             if path not in yaml_cache: