From c2f788adf537b9c668cfda99bffd6a2fd34d65f2 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahal@mozilla.com>
Date: Thu, 11 Jan 2024 15:52:27 -0500
Subject: [PATCH 1/2] VPN-6098: Create a 'mark-as-shipped' task for Shipit
 integration

This task makes a call to the Shipit API to update the release's status
to "shipped" once all other release tasks have successfully completed.

Issue: #8945
---
 taskcluster/config.yml                        |  8 +++++
 taskcluster/kinds/mark-as-shipped/kind.yml    | 29 +++++++++++++++++++
 .../transforms/set_name.py                    | 20 +++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 taskcluster/kinds/mark-as-shipped/kind.yml
 create mode 100644 taskcluster/mozillavpn_taskgraph/transforms/set_name.py

diff --git a/taskcluster/config.yml b/taskcluster/config.yml
index 9d754aacf..b15a56b51 100644
--- a/taskcluster/config.yml
+++ b/taskcluster/config.yml
@@ -105,6 +105,11 @@ workers:
             implementation: beetmover-import-from-gcs-to-artifact-registry
             os: scriptworker
             worker-type: 'mozillavpn-{level}-beetmover'
+        shipit:
+            provisioner: scriptworker-k8s
+            implementation: scriptworker-shipit
+            os: scriptworker
+            worker-type: 'mozillavpn-{level}-shipit'
         succeed:
             provisioner: built-in
             implementation: succeed
@@ -126,3 +131,6 @@ release-promotion:
         - fetch
         - toolchain
         - toolchain-openssl
+
+shipit:
+    scope-prefix: project:mozillavpn:releng:ship-it
diff --git a/taskcluster/kinds/mark-as-shipped/kind.yml b/taskcluster/kinds/mark-as-shipped/kind.yml
new file mode 100644
index 000000000..48f53911e
--- /dev/null
+++ b/taskcluster/kinds/mark-as-shipped/kind.yml
@@ -0,0 +1,29 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+loader: taskgraph.loader.transform:loader
+
+transforms:
+    - taskgraph.transforms.from_deps
+    - mozillavpn_taskgraph.transforms.set_name
+    - mozilla_taskgraph.transforms.scriptworker.shipit.mark_as_shipped
+    - taskgraph.transforms.task
+
+kind-dependencies:
+    - beetmover-ship
+
+tasks:
+    mark-as-shipped:
+        worker-type: shipit
+        from-deps:
+            group-by:
+                attribute: shipping-phase
+            copy-attributes: true
+            unique-kinds: false
+            set-name: false
+        shipit-product:
+            by-build-type:
+                addons/opt: mozilla-vpn-addons
+                default: mozilla-vpn-client
+        run-on-tasks-for: [action]
diff --git a/taskcluster/mozillavpn_taskgraph/transforms/set_name.py b/taskcluster/mozillavpn_taskgraph/transforms/set_name.py
new file mode 100644
index 000000000..628a9a64c
--- /dev/null
+++ b/taskcluster/mozillavpn_taskgraph/transforms/set_name.py
@@ -0,0 +1,20 @@
+from taskgraph.transforms.base import TransformSequence
+from taskgraph.util.dependencies import get_primary_dependency
+
+
+transforms = TransformSequence()
+
+
+@transforms.add
+def set_name(config, tasks):
+    for task in tasks:
+        if config.kind == "mark-as-shipped":
+            dep = get_primary_dependency(config, task)
+            assert dep
+
+            product = (
+                "addons" if dep.attributes["build-type"] == "addons/opt" else "client"
+            )
+            task["name"] = f"mark-as-shipped-{product}"
+
+        yield task

From cf455dfec6cfd7dd577589fc2a74045ef44e03bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 23:22:19 +0000
Subject: [PATCH 2/2] Bump androidx.test:core-ktx from 1.6.0-alpha04 to 1.6.0
 in /android

Bumps androidx.test:core-ktx from 1.6.0-alpha04 to 1.6.0.

---
updated-dependencies:
- dependency-name: androidx.test:core-ktx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 android/vpnClient/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/vpnClient/build.gradle b/android/vpnClient/build.gradle
index f86a7c52c..9b757bf7f 100644
--- a/android/vpnClient/build.gradle
+++ b/android/vpnClient/build.gradle
@@ -76,7 +76,7 @@ dependencies {
     implementation project(path: ':daemon')
     implementation project(path: ':qtglean')
 
-    testImplementation("androidx.test:core-ktx:1.6.0-alpha04")
+    testImplementation("androidx.test:core-ktx:1.6.0")
     testImplementation 'junit:junit:4.13.2'
     testImplementation project(path: ':vpnClient')
     testImplementation "org.robolectric:robolectric:4.11.1"