GitLab

at 2026-06-10T17:43:50-03:00

Bug 40113: Pass test tag as an argument for test jobs

   - local: '.gitlab/_base.yml'

     inputs:

       mozharness_url: $[[ inputs.mozharness_url ]]

+      tag: $[[ inputs.tag ]]

       android_x86_64_installer_url: $[[ inputs.android_x86_64_installer_url ]]

       android_x86_64_package_name: $[[ inputs.android_x86_64_package_name ]]

       android_x86_64_artifacts_url: $[[ inputs.android_x86_64_artifacts_url ]]

 - `android_x86_64_artifacts_url`: URL to the Android test artifacts, including `target.test_packages.json`.

 - `android_x86_64_sha256sums_url`: URL to the Android `sha256sums.txt` file. Optional. When provided, the job checks this URL is reachable before running the full test suite.

 - `android_x86_64_package_name`: Android package name to test.

+- `tag`: Tag used to filter tests. Defaults to `""`.

 All inputs default to the empty string. The platform-specific inputs are optional when triggering the pipeline as a whole, but the installer URL, artifacts URL, and (for Android) package name must be provided together for that platform's job to run.

 ---

 variables:

   MOZHARNESS_URL: "$[[ inputs.mozharness_url ]]"

+  TAG: "$[[ inputs.tag ]]"

 .common:

   before_script:

     type: string

     default: ""

     description: "Location of the mozharness.zip archive"

+  tag:

+    type: string

+    default: ""

+    description: "Tag used to filter tests"

   android_x86_64_installer_url:

     type: string

       --config-file "$(pwd)/mozharness/configs/marionette/prod_config.py"

       --installer-url "$INSTALLER_URL"

       --test-packages-url "$ARTIFACTS_URL/target.test_packages.json"

-      --tag tor

+      --tag "$TAG"

       --headless

 debian-x86_64_marionette:

       --installer-url "$INSTALLER_URL"

       --test-packages-url "$ARTIFACTS_URL/target.test_packages.json"

       --package-name "$PACKAGE_NAME"

-      --tag tor
+      --tag "$TAG"
     return unless $test->{results} && $test->{results}{success};

     return unless $test->{publish_dir};

+    my $tag = $test->{name} =~ /^torbrowser/ ? 'tor' : 'mullvad-browser';

     my ($stdout, $stderr, $success) = capture_exec(

         'python3', "$FindBin::Bin/tools/trigger-test-pipeline.py",

         '--step-name', $test->{name},

         '--publish-url', $publish_url,

         '--publish-dir', $test->{publish_dir},

+        '--tag', $tag,

     );

     write_file(

       "$tbbinfos->{'results-dir'}/$test->{name}.trigger-test-pipeline.stderr.txt",

         required=True,

         help="Subdirectory within the publish URL where build artifacts are located.",

     )

+    parser.add_argument(

+        "--tag",

+        required=False,

+        help="Tag used to filter tests.",

+    )

     parser.add_argument(

         "--dry-run",

         action="store_true",

     return parser.parse_args()

-def build_inputs(step_name: str, publish_url: str, publish_dir: str) -> dict[str, str] | None:

+def build_inputs(step_name: str, publish_url: str, publish_dir: str, tag: str) -> dict[str, str] | None:

     # Add the architecture as padding, to address the macos case which doesn't

     # have architecture in the step name since it is a universal build.

     browser, channel, platform, architecture = (step_name.split("-") + ["x86_64"])[:4]

     if platform == "android":

         inputs[f"{input_prefix}_package_name"] = f"org.torproject.{browser}_{channel}"

+    if tag:

+        inputs["tag"] = tag

+

     return inputs

     with open(token_file) as f:

         trigger_token = f.read().strip()

-    inputs = build_inputs(args.step_name, args.publish_url, args.publish_dir)

+    inputs = build_inputs(args.step_name, args.publish_url, args.publish_dir, args.tag)

     if inputs is None:

         logger.info(f"No CI inputs for step {args.step_name!r}, skipping.")

         return 0

boklm pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite

Commits:

7 changed files:

Changes: