Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

testing #1933

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

testing #1933

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions teuthology/packaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ def _init_from_config(self):
self.os_version, self.codename = \
OS.version_codename(self.os_type, self.os_version)
self.branch = self.job_config.get("branch")
log.info(f"@@@@@@@@ branch selected: {self.branch} @@@@@@")
self.tag = self.job_config.get("tag")
self.ref = self.job_config.get("ref")
self.distro = self._get_distro(
Expand Down Expand Up @@ -656,6 +657,7 @@ def _get_uri_reference(self):

:returns: A string URI. Ex: ref/main
"""
log.debug('using _get_uri_reference')
ref_name, ref_val = next(iter(self._choose_reference().items()))
if ref_name == 'sha1':
return 'sha1/%s' % ref_val
Expand All @@ -673,6 +675,7 @@ def _choose_reference(self):
"""
tag = branch = sha1 = None
if self.remote:
log.info('remote provided')
tag = _get_config_value_for_remote(self.ctx, self.remote,
self.job_config, 'tag')
branch = _get_config_value_for_remote(self.ctx, self.remote,
Expand All @@ -681,6 +684,7 @@ def _choose_reference(self):
self.job_config, 'sha1')
ref = None
else:
log.info('no remote')
ref = self.ref
tag = self.tag
branch = self.branch
Expand All @@ -699,13 +703,15 @@ def warn(attrname):
for n, v in zip(names, vars):
log.info('%s: %s' % (n, v))

log.info(f"@@@@ ref: {ref}, tag: {tag}, branch: {branch}, sha1: {sha1} @@@@")
if ref:
warn('ref')
return dict(ref=ref)
elif tag:
warn('tag')
return dict(tag=tag)
elif branch:
log.debug(f"branch returned: {branch}")
warn('branch')
return dict(branch=branch)
elif sha1:
Expand Down
2 changes: 2 additions & 0 deletions teuthology/task/install/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,8 @@ def task(ctx, config):
teuthology.deep_merge(config, install_overrides.get(project, {}))
repos = install_overrides.get('repos', None)
log.debug('INSTALL overrides: %s' % install_overrides)
config['branch'] = 'pacific'
log.debug(f"config branch {config['branch']}")
log.debug('config %s' % config)

rhbuild = None
Expand Down