From 2dd5704f7b3cf695af8750b1d4924f87906e4fed Mon Sep 17 00:00:00 2001
From: lnie <lnie@redhat.com>
Date: Sep 26 2020 03:41:02 +0000
Subject: modify dockerfile


---

diff --git a/Dockerfile b/Dockerfile
index 050bc0a..fbf9e71 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,18 @@
 FROM fedora:latest
 RUN dnf -y install fedora-messaging pip beaker-client git gcc python-devel 
-COPY conf /fedora-release-autotest/conf
+RUN useradd --create-home --no-log-init --shell /bin/bash lnie
+RUN echo 'lnie:redhattest' | chpasswd
+COPY conf/data/client.conf  /etc/beaker/client.conf
+COPY conf/data/RedHatInternalCA.pem /etc/beaker/RedHatInternalCA.pem
 COPY fedora_release_autotest /fedora-release-autotest/fedora_release_autotest
+COPY conf /fedora-release-autotest/conf
 COPY setup.py /fedora-release-autotest/
 COPY install.requires /fedora-release-autotest/
+RUN mkdir /.openidc/
+RUN touch /.openidc/oidc_wikitcms.json
 WORKDIR /fedora-release-autotest
-RUN pip install --force-reinstall .
-RUN sed -e "s/[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}/$(uuidgen)/g" conf/fedora-release-autotest.toml > /var/my.toml
-Run cp conf/data/client.conf /etc/beaker/client.conf
-Run cp conf/data/RedHatInternalCA.pem /etc/beaker/RedHatInternalCA.pem
-ENTRYPOINT ["fedora-messaging", "--conf", "/var/my.toml", "consume"]
+RUN cp conf/data/oidc_wikitcms.json /.openidc/oidc_wikitcms.json
+RUN chmod 777 /.openidc/oidc_wikitcms.json
+RUN sed -e "s/[0-9a-f]\{8\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{4\}-[0-9a-f]\{12\}/$(uuidgen)/g" conf/fedora-release-autotest.toml > /tmp/my.toml
+RUN pip install --force-reinstall  .
+ENTRYPOINT ["fedora-messaging", "--conf", "/tmp/my.toml", "consume"]
diff --git a/conf/data/oidc_wikitcms.json b/conf/data/oidc_wikitcms.json
index e89916c..fc1ca7f 100644
--- a/conf/data/oidc_wikitcms.json
+++ b/conf/data/oidc_wikitcms.json
@@ -1 +1 @@
-{"d7a3d4db75c44841a9d7d1cf3fa1e062": {"access_token": "2bd273f7-f2f6-4825-a2de-7ba56b392f9d_9ST4FDxN3WqfvRe5Wuilye6ya9s-uJVOcWmcqdkHOe9szSlG7_omkmlDY61I4xQK", "refresh_token": "R_5a5ef45d-f09d-4a33-90c4-8244a9428086_Fsz7XERKMuBQANSVCeL50bugkNWxU3eo5wwdfhuYfQpRjpLxpd0KtWnezJ8y32MdWkD3MiqOU0xgI7uYbt8H-o7IZ82bc9lQ11LmbflJwYCeKZ4MhbO9LKHod6JJ0Cxr", "expires_at": 1599792129.5940368, "idp": "https://id.fedoraproject.org/openidc/", "token_type": "Bearer", "scopes": ["openid", "https://fedoraproject.org/wiki/api"]}}
+{"06cd59660d8e48c7872f9ac26cafb243": {"access_token": "2bd273f7-f2f6-4825-a2de-7ba56b392f9d_9ST4FDxN3WqfvRe5Wuilye6ya9s-uJVOcWmcqdkHOe9szSlG7_omkmlDY61I4xQK", "refresh_token": "", "expires_at": 1600918035.9132075, "idp": "https://id.fedoraproject.org/openidc/", "token_type": "Bearer", "scopes": ["openid", "https://fedoraproject.org/wiki/api"]}}
diff --git a/fedora_release_autotest/beaker.py b/fedora_release_autotest/beaker.py
index a84d10a..70d70c8 100644
--- a/fedora_release_autotest/beaker.py
+++ b/fedora_release_autotest/beaker.py
@@ -132,7 +132,6 @@ async def pull_beaker_job(job_id: str):
                 success = True
                 return recipes
             else:
-                logger.info("installing or queued")
                 pass  # recipes pending, keep pulling
 
     finally:
diff --git a/fedora_release_autotest/consumer.py b/fedora_release_autotest/consumer.py
index f74e8dc..62c20c2 100644
--- a/fedora_release_autotest/consumer.py
+++ b/fedora_release_autotest/consumer.py
@@ -129,21 +129,15 @@ class Consumer:
 
     def __call__(self, message):
 
-        if 'we' == 'we':
+        try:
             log.logger_init()
             logger.info(message)
-            #data = consume_message(message)
-            data = { "cpu-arch": "x86_64",
-                     "beaker-distro": "Fedora-33-20200912.n.0",
-                     "distro_variant": "Server",
-                     "system-type": "baremetal",
-                     "do_report": "true",
-                     "wiki_hostname": "fedoraproject.org",
-                   }
+            data = consume_message(message)
 
             if data:
+
                 #We have to give beaker some time to sync the repo
-             #   time.sleep(4800)
+                time.sleep(4800)
                 asyncio.run(process_data(data))
-      #  except Exception as e:
-       #     logger.error("consumer failed: %s"%e)
+        except Exception as e:
+            logger.error("consumer failed: %s"%e)
diff --git a/fedora_release_autotest/convertor.py b/fedora_release_autotest/convertor.py
index fc354d6..68276a2 100644
--- a/fedora_release_autotest/convertor.py
+++ b/fedora_release_autotest/convertor.py
@@ -337,7 +337,7 @@ def add_reserve_task(recipe: Element, sanitized_query: dict):
     task_param = etree.SubElement(task_params, 'param')
     task_param.set('name', 'RSTRNT_DISABLED')
     task_param.set('value', '01_dmesg_check 10_avc_check')
-    reserve_time = sanitized_query.get('provision-lifespan', 3600)
+    reserve_time = sanitized_query.get('provision-lifespan', 7200)
     task_param.set('name', 'RESERVETIME')
     task_param.set('value', str(reserve_time))