Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
Showing only changes of commit fa967f79b5 - Show all commits

View File

@ -102,6 +102,7 @@ def get_compose_info(
if "$HOSTNAME" in cts_keytab: if "$HOSTNAME" in cts_keytab:
cts_keytab = cts_keytab.replace("$HOSTNAME", socket.gethostname()) cts_keytab = cts_keytab.replace("$HOSTNAME", socket.gethostname())
os.environ["KRB5_CLIENT_KTNAME"] = cts_keytab os.environ["KRB5_CLIENT_KTNAME"] = cts_keytab
os.environ["KRB5CCNAME"] = "DIR:%s" % tempfile.mkdtemp()
try: try:
# Create compose in CTS and get the reserved compose ID. # Create compose in CTS and get the reserved compose ID.
@ -116,6 +117,7 @@ def get_compose_info(
rv.raise_for_status() rv.raise_for_status()
finally: finally:
if cts_keytab: if cts_keytab:
shutil.rmtree(os.environ["KRB5CCNAME"].split(":", 1)[1])
os.environ.clear() os.environ.clear()
os.environ.update(environ_copy) os.environ.update(environ_copy)