diff --git a/taskcluster/config.yml b/taskcluster/config.yml index 5cb92c4754..e751635b3f 100644 --- a/taskcluster/config.yml +++ b/taskcluster/config.yml @@ -105,6 +105,14 @@ workers: implementation: beetmover-import-from-gcs-to-artifact-registry os: scriptworker worker-type: 'mozillavpn-{level}-beetmover' + # For now the `beetmover-apt-promote` task is importing to the staging + # apt repository. To do this it needs to run on a level 1 worker, + # despite running in an L3 release graph. See bug 1927890. + beetmover-apt-stage: + provisioner: scriptworker-k8s + implementation: beetmover-import-from-gcs-to-artifact-registry + os: scriptworker + worker-type: 'mozillavpn-1-beetmover' shipit: provisioner: scriptworker-k8s implementation: scriptworker-shipit diff --git a/taskcluster/kinds/beetmover-apt/kind.yml b/taskcluster/kinds/beetmover-apt/kind.yml index d19463d4be..a784475ce0 100644 --- a/taskcluster/kinds/beetmover-apt/kind.yml +++ b/taskcluster/kinds/beetmover-apt/kind.yml @@ -20,16 +20,17 @@ task-defaults: build-type: - linux64/release-deb set-name: null - worker-type: beetmover-apt worker: product: vpn max-run-time: 1800 tasks: promote-linux64-deb: + worker-type: beetmover-apt-stage attributes: shipping-phase: promote-client ship-linux64-deb: + worker-type: beetmover-apt attributes: shipping-phase: ship-client