qontract-reconcile 0.10.1rc197__py3-none-any.whl → 0.10.1rc199__py3-none-any.whl

{qontract_reconcile-0.10.1rc197.dist-info → qontract_reconcile-0.10.1rc199.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc197
+Version: 0.10.1rc199
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc197.dist-info → qontract_reconcile-0.10.1rc199.dist-info}/RECORD

@@ -33,7 +33,7 @@ reconcile/gitlab_permissions.py,sha256=ciEKj_wnRbS_vs_ZwcUeD6HkWVe3osAuotFqJSmvd
 reconcile/gitlab_projects.py,sha256=K3tFf_aD1W4Ijp5q-9Qek3kwFGEWPcZ1kd7tzFJ4GyQ,1781
 reconcile/integrations_manager.py,sha256=zUCh1bYrnNoT_6SSQO-yYA2QdDxfCuzwb1tjcByIOaE,8885
 reconcile/jenkins_base.py,sha256=0Gocu3fU2YTltaxBlbDQOUvP-7CP2OSQV1ZRwtWeVXw,875
-reconcile/jenkins_job_builder.py,sha256=tfar8m5dyYlOZxgoMBvs1Woa698PftZCrCsvTzL3tLg,3930
+reconcile/jenkins_job_builder.py,sha256=8mcvvkPvcgw0hZnYTcuh9P-ltSHwqg8zihXh7oxGuzI,3957
 reconcile/jenkins_job_builds_cleaner.py,sha256=zK8gQgXY5Ab5aDk8yPiXg0ogUEBOGmbyo8wEEtK342k,3190
 reconcile/jenkins_job_cleaner.py,sha256=8DetVJsUFf68ZtUwaO9Vg9ohAsua2uA0Q6ykI4j3K0w,1794
 reconcile/jenkins_roles.py,sha256=hOLPiPs2Juv7l8mGBj5-e88DqgvLbLldf0Xk0ylUzHE,4577
@@ -510,7 +510,7 @@ reconcile/utils/instrumented_wrappers.py,sha256=eVwMoa6FCrYxLv3RML3WpZF9qKVfCTjM
 reconcile/utils/jenkins_api.py,sha256=BlHOUDG3Nn5K4qPU-js2ewV_IhciISfCnQwfaZlewu8,7054
 reconcile/utils/jinja2_ext.py,sha256=l628RR9r9dAGBWLVegoCbSqnjojeizNGiq9Cstt02nE,1129
 reconcile/utils/jira_client.py,sha256=pQw4LKZL5d-Guaj4BMiIVrL6EZsmAMYII1-b8xYZ8Yk,5021
-reconcile/utils/jjb_client.py,sha256=bj40UNRbvQ93K-1tndzJI6Drt_sebRXq-qUpfDx2ozw,14496
+reconcile/utils/jjb_client.py,sha256=0kpEsLI-cN-k-J_79x-NR2nr_h0Hz74GC9st7XVpX88,14682
 reconcile/utils/jsonpath.py,sha256=NRpAEijKN4cMDjo7qivNPqpm0__GQQ1TiE0PBEBO45s,5572
 reconcile/utils/jump_host.py,sha256=yJZBRnoCJ-fknhT9f_cli_1J5hBRh1PsRVDyDWpjhws,4935
 reconcile/utils/keycloak.py,sha256=tGOzfmG7wyOGUV8fn6XMrFWB1QAI02_3jf_8GCo5bKI,3144
@@ -530,7 +530,7 @@ reconcile/utils/output.py,sha256=htcMXMe0y2dNnwu8MW8x0JZ5YBaEJRy5w4tR8yLF0OU,173
 reconcile/utils/pagerduty_api.py,sha256=ckZZMn_ri7mUFsmMb8Lejuw5Lf_0-OWv8MbOzPc2zkQ,7567
 reconcile/utils/parse_dhms_duration.py,sha256=ZJGlB43MjhgckgO3OF_nacwTiKVRpxb5Yv7m-PnaQLk,1616
 reconcile/utils/password_validator.py,sha256=XwuWg-8CPlcuG7dl_oQ1G1h2gSVSnfMym_VkuprpWVg,2183
-reconcile/utils/promotion_state.py,sha256=OIxVOsmIMp22V5m2Lt-SdalJXMkLzg23EN2XxVGTHJ8,3987
+reconcile/utils/promotion_state.py,sha256=nnoQIwg89Oil37WBY0KrdBbq7znHKyZWLoN91xedjJc,3740
 reconcile/utils/promtool.py,sha256=IYNCjj5xDAEdxv6Z0pLdrIcybDfHHtWE9Z6f4LSPcG4,2791
 reconcile/utils/quay_api.py,sha256=EuOegpb-7ntEjkKLFwM2Oo4Nw7SyFtmyl3sQ9aXMtrM,8152
 reconcile/utils/raw_github_api.py,sha256=ZHC-SZuAyRe1zaMoOU7Krt1-zecDxENd9c_NzQYqK9g,2968
@@ -612,8 +612,8 @@ tools/test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tools/test/test_qontract_cli.py,sha256=awwTHEc2DWlykuqGIYM0WOBoSL0KRnOraCLk3C7izis,1401
 tools/test/test_sd_app_sre_alert_report.py,sha256=JeLhgzpKCPgLvptwg_4ZvJHLVWKNG1T5845HXTkMBxA,1826
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc197.dist-info/METADATA,sha256=5wRolgRrcQ5khN7NZ4bC-J6CL_MIKV66l3u_Wj-sMJI,2320
-qontract_reconcile-0.10.1rc197.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-qontract_reconcile-0.10.1rc197.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
-qontract_reconcile-0.10.1rc197.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc197.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc199.dist-info/METADATA,sha256=LpCVban2xudrlx6MYnsN5BqsQDySsC9njyXLe6mP7vM,2320
+qontract_reconcile-0.10.1rc199.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+qontract_reconcile-0.10.1rc199.dist-info/entry_points.txt,sha256=Af70EWPJxsTiCNF6gA-pWdw1A0Heqn-PZF-oBc5NmiU,302
+qontract_reconcile-0.10.1rc199.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc199.dist-info/RECORD,,

reconcile/jenkins_job_builder.py

@@ -20,6 +20,9 @@ QUERY = """
 {
   jenkins_configs: jenkins_configs_v1 {
     name
+    app {
+      name
+    }
     instance {
       name
       serverUrl

reconcile/utils/jjb_client.py

@@ -77,8 +77,12 @@ class JJB:  # pylint: disable=too-many-public-methods
             config = c["config"]
             config_file_path = "{}/config.yaml".format(working_dirs[instance_name])
             if config:
+                content = yaml.load(config, Loader=yaml.FullLoader)
+                if c["type"] == "jobs":
+                    for item in content:
+                        item["project"]["app_name"] = c["app"]["name"]
                 with open(config_file_path, "a") as f:
-                    yaml.dump(yaml.load(config, Loader=yaml.FullLoader), f)
+                    yaml.dump(content, f)
                     f.write("\n")
             else:
                 config = c["config_path"]["content"]

reconcile/utils/promotion_state.py

@@ -81,6 +81,13 @@ class PromotionState:
             # Lets reduce unecessary calls to S3
             return None
 
+        path_v2 = f"promotions_v2/{channel}/{target_uid}/{sha}"
+        try:
+            data = self._state.get(path_v2)
+            return PromotionData(**data)
+        except KeyError:
+            pass
+
         # BACKWARDS-COMPAT BLOCK
         # Keep for backwards-compatibility with v1 promotions
         # We wait a couple of months to be sure all pipelines have
@@ -90,25 +97,13 @@ class PromotionState:
         try:
             data = self._state.get(path_v1)
             return PromotionData(**data)
-        except KeyError:
-            pass
-        # / BACKWARDS-COMPAT BLOCK
-
-        path_v2 = f"promotions_v2/{channel}/{target_uid}/{sha}"
-        try:
-            data = self._state.get(path_v2)
-            return PromotionData(**data)
         except KeyError:
             return None
+        # / BACKWARDS-COMPAT BLOCK
 
     def publish_promotion_data(
         self, sha: str, channel: str, target_uid: str, data: PromotionData
     ) -> None:
-        # TODO: this will be deprecated once we fully moved to promotions_v2
-        state_key = f"promotions/{channel}/{sha}"
-        self._state.add(state_key, data.dict(), force=True)
-        logging.info("Uploaded %s to %s", data, state_key)
-
         state_key_v2 = f"promotions_v2/{channel}/{target_uid}/{sha}"
         self._state.add(state_key_v2, data.dict(), force=True)
         logging.info("Uploaded %s to %s", data, state_key_v2)