FIXUP: tests-scan: re-enable cross-project 'job' creation -- update u…

…nit test
cockpit-project · Mar 12, 2024 · 8441223 · 8441223
1 parent aff529c
commit 8441223
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/test/test_tests_scan.py b/test/test_tests_scan.py
@@ -439,14 +439,32 @@ def do_test_amqp_pr_cross_project(self, status_branch, mock_queue, _mock_strftim
             f'cd make-checkout-workdir && TEST_OS=fedora BASE_BRANCH={branch} COCKPIT_BOTS_REF=main '
             'TEST_SCENARIO=nightly ../tests-invoke --pull-number 1 --revision abcdef --repo project/repo"')
 
+        slug_repo_branch = repo_branch.replace('@', '-').replace('/', '-')
+
         assert request == {
             "command": expected_command,
             "type": "test",
             "sha": "abcdef",
             "ref": branch,
             "name": f"pull-{self.pull_number}",
-            # job-runner currently disabled for cross-project tests (commit c377eb892)
-            "job": None,
+            "job": {
+                "context": f"fedora/nightly@{repo_branch}",
+                "repo": "project/repo",
+                "pull": int(self.pull_number),
+                "report": None,
+                "sha": "abcdef",
+                "slug": f"pull-{self.pull_number}-abcdef-20240102-030405-fedora-nightly-{slug_repo_branch}",
+                "target": "main",  # PR target, not test branch
+                "container": None,
+                "command-subject": {"repo": "cockpit-project/cockpituous", "branch": branch},
+                "secrets": ["github-token", "image-download"],
+                "env": {
+                    "BASE_BRANCH": branch,
+                    "COCKPIT_BOTS_REF": "main",
+                    "TEST_OS": "fedora",
+                    "TEST_SCENARIO": "nightly",
+                }
+            }
         }
 
     def test_amqp_sha_pr_cross_project_default_branch(self):