diff options
Diffstat (limited to 'taskcluster')
| -rw-r--r-- | taskcluster/ci/release-update-verify-config-next/kind.yml | 98 | ||||
| -rw-r--r-- | taskcluster/ci/release-update-verify-next/kind.yml | 73 | ||||
| -rw-r--r-- | taskcluster/docker/firefox-snap/Dockerfile | 4 |
3 files changed, 4 insertions, 171 deletions
diff --git a/taskcluster/ci/release-update-verify-config-next/kind.yml b/taskcluster/ci/release-update-verify-config-next/kind.yml deleted file mode 100644 index 959d0afb9a..0000000000 --- a/taskcluster/ci/release-update-verify-config-next/kind.yml +++ /dev/null @@ -1,98 +0,0 @@ -# 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: gecko_taskgraph.loader.transform:loader - -transforms: - - gecko_taskgraph.transforms.release:run_on_releases - - gecko_taskgraph.transforms.update_verify_config:transforms - - gecko_taskgraph.transforms.job:transforms - - gecko_taskgraph.transforms.task:transforms - -job-defaults: - name: update-verify-config-next - run-on-projects: [] # to make sure this never runs as part of CI - run-on-releases: [esr115] - shipping-phase: promote - worker-type: b-linux-gcp - worker: - docker-image: - in-tree: "update-verify" - max-run-time: 3600 - artifacts: - - name: public/build/update-verify.cfg - path: /builds/worker/checkouts/gecko/update-verify.cfg - type: file - run: - sparse-profile: mozharness - treeherder: - symbol: UVCnext - kind: test - tier: 1 - extra: - app-name: browser - branch-prefix: mozilla - archive-prefix: - by-release-level: - staging: "http://ftp.stage.mozaws.net/pub" - production: "https://archive.mozilla.org/pub" - previous-archive-prefix: - by-release-level: - staging: "https://archive.mozilla.org/pub" - production: null - aus-server: - by-release-level: - staging: "https://stage.balrog.nonprod.cloudops.mozgcp.net" - production: "https://aus5.mozilla.org" - override-certs: - by-release-level: - staging: dep - production: null - updater-platform: linux-x86_64 - product: firefox - channel: "esr-localtest-next" - include-version: esr115-next - last-watershed: "68.0esr" - -jobs: - firefox-next-linux: - shipping-product: firefox - treeherder: - platform: linux32-shippable/opt - attributes: - build_platform: linux-shippable - extra: - platform: linux-i686 - firefox-next-linux64: - shipping-product: firefox - treeherder: - platform: linux64-shippable/opt - attributes: - build_platform: linux64-shippable - extra: - platform: linux-x86_64 - firefox-next-macosx64: - shipping-product: firefox - treeherder: - platform: osx-shippable/opt - attributes: - build_platform: macosx64-shippable - extra: - platform: mac - firefox-next-win32: - shipping-product: firefox - treeherder: - platform: windows2012-32-shippable/opt - attributes: - build_platform: win32-shippable - extra: - platform: win32 - firefox-next-win64: - shipping-product: firefox - treeherder: - platform: windows2012-64-shippable/opt - attributes: - build_platform: win64-shippable - extra: - platform: win64 diff --git a/taskcluster/ci/release-update-verify-next/kind.yml b/taskcluster/ci/release-update-verify-next/kind.yml deleted file mode 100644 index ad72e9b118..0000000000 --- a/taskcluster/ci/release-update-verify-next/kind.yml +++ /dev/null @@ -1,73 +0,0 @@ -# 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: gecko_taskgraph.loader.transform:loader - -kind-dependencies: - - post-balrog-dummy - - post-beetmover-dummy - - release-balrog-submit-toplevel - - release-update-verify-config-next - -transforms: - - gecko_taskgraph.transforms.release:run_on_releases - - gecko_taskgraph.transforms.release_deps:transforms - - gecko_taskgraph.transforms.update_verify:transforms - - gecko_taskgraph.transforms.job:transforms - - gecko_taskgraph.transforms.task:transforms - -job-defaults: - name: update-verify-next - run-on-projects: [] # to make sure this never runs as part of CI - run-on-releases: [esr115] - shipping-phase: promote - worker-type: b-linux-gcp - worker: - artifacts: - - name: 'public/build/diff-summary.log' - path: '/builds/worker/tools/release/updates/diff-summary.log' - type: file - docker-image: - in-tree: "update-verify" - max-run-time: 7200 - retry-exit-status: - - 255 - env: - CHANNEL: "esr-localtest-next" - treeherder: - symbol: UVnext() - kind: test - extra: - chunks: 12 - -jobs: - firefox-next-linux64: - description: linux64 esr-next update verify - shipping-product: firefox - attributes: - build_platform: linux64-shippable - - firefox-next-linux: - description: linux esr-next update verify - shipping-product: firefox - attributes: - build_platform: linux-shippable - - firefox-next-win64: - description: win64 esr-next update verify - shipping-product: firefox - attributes: - build_platform: win64-shippable - - firefox-next-win32: - description: win32 esr-next update verify - shipping-product: firefox - attributes: - build_platform: win32-shippable - - firefox-next-macosx64: - description: macosx64 esr-next update verify - shipping-product: firefox - attributes: - build_platform: macosx64-shippable diff --git a/taskcluster/docker/firefox-snap/Dockerfile b/taskcluster/docker/firefox-snap/Dockerfile index dc002c0133..0f24a6bbd5 100644 --- a/taskcluster/docker/firefox-snap/Dockerfile +++ b/taskcluster/docker/firefox-snap/Dockerfile @@ -40,6 +40,8 @@ locale-gen "$LANG" COPY download_and_install_snap.sh . RUN bash download_and_install_snap.sh 'core20' +# Snapcraft now requires core22 for python3.10 +RUN bash download_and_install_snap.sh 'core22' RUN bash download_and_install_snap.sh 'gnome-3-38-2004' RUN bash download_and_install_snap.sh 'gnome-3-38-2004-sdk' RUN bash download_and_install_snap.sh 'snapcraft' @@ -57,6 +59,8 @@ RUN snap_version="$(awk '/^version:/{print $2}' /snap/snapcraft/current/meta/sna RUN echo 'exec "$SNAP/usr/bin/python3" "$SNAP/bin/snapcraft" "$@"' >> /snap/bin/snapcraft RUN chmod +x /snap/bin/snapcraft +RUN snapcraft version + RUN mkdir /scripts/ WORKDIR /scripts/ # Copy everything in the docker/firefox-snap folder but the Dockerfile |