From 0fd509ea67960838d44bbc3ae655ab820265057b Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: May 20 2020 18:37:47 +0000 Subject: [PATCH 1/2] Fixing koji login Signed-off-by: Mohan Boddu --- diff --git a/fedora-minimal-compose.py b/fedora-minimal-compose.py index 4cd34f4..d14afae 100755 --- a/fedora-minimal-compose.py +++ b/fedora-minimal-compose.py @@ -33,7 +33,7 @@ class Consumer(object): # packages_list = ['anaconda', 'authconfig', 'python-blivet', 'pyparted', 'parted', 'pykickstart', 'blivet-gui', 'libblockdev', 'e2fsprogs', 'dosfstools', 'grub2', 'shim-signed', 'libselinux', 'chrony', 'fcoe-utils', 'hfsplus-tools', 'firewalld', 'realmd', 'yelp', 'libtimezonemap', 'kernel', 'systemd', 'dracut', 'plymouth', 'gtk3', 'python3'] # Create a koji session self.kojisession = koji.ClientSession(self.config['koji_url']) - self.kojisession.gssapi_login(self.config['principal'], self.config['keytab']) + self.kojisession.gssapi_login(principal=self.config['principal'], keytab=self.config['keytab']) self.kojisession.multicall = True def save_nvr_to_file(self, nvr): From dcfb8c4b1179fc702d1e6acdc74c241e72e5efb0 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: May 20 2020 19:43:02 +0000 Subject: [PATCH 2/2] Adding get_odcs_token() back Signed-off-by: Mohan Boddu --- diff --git a/fedora-minimal-compose.py b/fedora-minimal-compose.py index d14afae..360020b 100755 --- a/fedora-minimal-compose.py +++ b/fedora-minimal-compose.py @@ -26,7 +26,7 @@ class Consumer(object): self.rawhide = self.config['rawhide'] self.fmc_tag = f'f{self.rawhide}-minimal-compose' self.odcs_url = self.config['odcs_url'] - self.odcs_token = self.config['odcs_token'] + self.odcs_file = self.config['odcs_file'] self.packages_list = self.config['packages'] # ['anaconda', 'authconfig', 'python-blivet', 'pyparted', 'parted', 'pykickstart', 'blivet-gui', 'libblockdev', 'e2fsprogs', 'dosfstools', 'grub2', 'shim-signed', 'libselinux'] # When we have the ability to run one compose for multiple builds, use the following list @@ -59,10 +59,18 @@ class Consumer(object): logger.error(f'Tagging {new_build} from {self.fmc_tag} failed, exception: {e}') self.kojisession.multiCall() - def run_compose(self): + def get_odcs_token(odcs_file): + if os.path.exists(odcs_file): + f = open(odcs_file, "r") + token = f.readline() + return token + else: + logger.error('ODCS token file is missing.') + + def run_compose(self, odcs_token): odcs = ODCS(self.odcs_url, auth_mech=AuthMech.OpenIDC, - openidc_token=self.odcs_token) + openidc_token=odcs_token) source = ComposeSourceRawConfig("releng_fmc", "master") compose_info = odcs.request_compose(source) @@ -92,7 +100,9 @@ class Consumer(object): self.save_nvr_to_file(build) # Pre compose koji tasks self.run_koji_tasks(build) + # Get ODCS token + odcs_token = self.get_odcs_token(self.odcs_file) # Run the compose - compose_info = self.run_compose() + compose_info = self.run_compose(odcs_token) # Inject the file to into the compose log dir self.inject_builds_compose(compose_info)