Loading ci/sdk_consumer.py +8 −2 Changes for ci/sdk_consumer.py: 8 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -21,7 +21,10 @@ def digest(path): def main(): OUT.mkdir(parents=True, exist_ok=True) expected_srm = os.getenv("EXPECTED_SRM_SHA") revision = subprocess.check_output(["git", "rev-parse", "HEAD"], text=True).strip() revision = ( os.getenv("CI_COMMIT_SHA") or subprocess.check_output(["git", "rev-parse", "HEAD"], text=True).strip() ) if expected_srm and revision != expected_srm: raise ValueError("Consumer checkout differs from the requested SRM revision") sha = os.environ["SDK_SOURCE_SHA"] Loading Loading @@ -72,7 +75,10 @@ def main(): suites = ElementTree.parse(report).getroot() if any(int(s.get("skipped", "0")) for s in suites.iter("testsuite")): raise ValueError("Skipped consumer tests cannot qualify the candidate") revision = subprocess.check_output(["git", "rev-parse", "HEAD"], text=True).strip() revision = ( os.getenv("CI_COMMIT_SHA") or subprocess.check_output(["git", "rev-parse", "HEAD"], text=True).strip() ) (OUT / "qualification.json").write_text( json.dumps( { Loading Loading
ci/sdk_consumer.py +8 −2 Changes for ci/sdk_consumer.py: 8 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -21,7 +21,10 @@ def digest(path): def main(): OUT.mkdir(parents=True, exist_ok=True) expected_srm = os.getenv("EXPECTED_SRM_SHA") revision = subprocess.check_output(["git", "rev-parse", "HEAD"], text=True).strip() revision = ( os.getenv("CI_COMMIT_SHA") or subprocess.check_output(["git", "rev-parse", "HEAD"], text=True).strip() ) if expected_srm and revision != expected_srm: raise ValueError("Consumer checkout differs from the requested SRM revision") sha = os.environ["SDK_SOURCE_SHA"] Loading Loading @@ -72,7 +75,10 @@ def main(): suites = ElementTree.parse(report).getroot() if any(int(s.get("skipped", "0")) for s in suites.iter("testsuite")): raise ValueError("Skipped consumer tests cannot qualify the candidate") revision = subprocess.check_output(["git", "rev-parse", "HEAD"], text=True).strip() revision = ( os.getenv("CI_COMMIT_SHA") or subprocess.check_output(["git", "rev-parse", "HEAD"], text=True).strip() ) (OUT / "qualification.json").write_text( json.dumps( { Loading