Bug 1827794 - Switch private toolchains that don't use artifact_prefix to it. r=taskgraph-reviewers,jcristau

Those tasks predate the addition of the artifact_prefix attribute, which
simplifies things significantly, so switching to it is for the better.

Differential Revision: https://phabricator.services.mozilla.com/D175320
This commit is contained in:
Mike Hommey 2023-04-14 01:38:35 +00:00
Родитель 9ec8de73f7
Коммит b5d3336fe4
8 изменённых файлов: 16 добавлений и 46 удалений

Просмотреть файл

@ -77,11 +77,8 @@ linux64-android-system-image-x86_64-repack:
description: "Android System Images (Linux) repack toolchain build"
treeherder:
symbol: TL(x86_64-avd-img-linux)
worker:
artifacts:
- name: project/gecko/android-system-images
path: /builds/worker/project/gecko/android-system-images/
type: directory
attributes:
artifact_prefix: project/gecko/android-system-images
run:
script: repack-android-system-images-linux.sh
arguments:
@ -99,11 +96,8 @@ linux64-jdk-repack:
description: "Java JDK (Linux) repack toolchain build"
treeherder:
symbol: TL(jdk)
worker:
artifacts:
- name: project/gecko/jdk
path: /builds/worker/project/gecko/jdk/
type: directory
attributes:
artifact_prefix: project/gecko/jdk
run:
script: repack-jdk-linux.sh
resources:
@ -115,13 +109,10 @@ linux64-jdk-repack:
linux64-android-sdk-linux-repack:
description: "Android SDK (Linux) repack toolchain build"
attributes:
artifact_prefix: project/gecko/android-sdk
treeherder:
symbol: TL(android-sdk-linux)
worker:
artifacts:
- name: project/gecko/android-sdk
path: /builds/worker/project/gecko/android-sdk/
type: directory
run:
script: repack-android-sdk-linux.sh
resources:
@ -137,11 +128,8 @@ linux64-android-emulator-linux-repack:
description: "Android Emulator (Linux) repack toolchain build"
treeherder:
symbol: TL(android-emulator-linux)
worker:
artifacts:
- name: project/gecko/android-emulator
path: /builds/worker/project/gecko/android-emulator/
type: directory
attributes:
artifact_prefix: project/gecko/android-emulator
run:
script: repack-android-emulator-linux.sh
resources:
@ -157,11 +145,8 @@ linux64-android-ndk-linux-repack:
description: "Android NDK (Linux) repack toolchain build"
treeherder:
symbol: TL(android-ndk-linux)
worker:
artifacts:
- name: project/gecko/android-ndk
path: /builds/worker/project/gecko/android-ndk/
type: directory
attributes:
artifact_prefix: project/gecko/android-ndk
run:
script: repack-android-ndk-linux.sh
resources:

Просмотреть файл

@ -107,15 +107,11 @@ win64-clang-tidy:
linux64-clang-tidy-external:
attributes:
local-toolchain: false
artifact_prefix: project/civet
index:
job-name: linux64-clang-tidy-external
treeherder:
symbol: TL(clang-tidy-e)
worker:
artifacts:
- name: project/civet/clang-tidy.tar.zst
path: /builds/worker/private-artifacts/clang-tidy.tar.zst
type: file
run:
toolchain-artifact: project/civet/clang-tidy.tar.zst
script: build-clang-tidy-external.sh

Просмотреть файл

@ -1,9 +1,6 @@
#!/bin/bash
set -x
# Because we specify a private artifact, UPLOAD_DIR is not populated for us
export UPLOAD_DIR="/builds/worker/private-artifacts/"
# # Delete the external directory
rm -rf $GECKO_PATH/build/clang-plugin/external/*

Просмотреть файл

@ -4,9 +4,7 @@ set -x -e -v
# This script is for fetching and repacking the Android emulator (for
# Linux), the tools required to produce Android packages.
UPLOAD_DIR=$HOME/project/gecko/android-emulator
mkdir -p $HOME/artifacts $UPLOAD_DIR
mkdir -p $UPLOAD_DIR
# Populate /builds/worker/.mozbuild/android-emulator-linux.
cd $GECKO_PATH

Просмотреть файл

@ -4,9 +4,7 @@ set -x -e -v
# This script is for fetching and repacking the Android NDK (for
# Linux), the tools required to produce native Android programs.
UPLOAD_DIR=$HOME/project/gecko/android-ndk
mkdir -p $HOME/artifacts $UPLOAD_DIR
mkdir -p $UPLOAD_DIR
# Populate /builds/worker/.mozbuild/android-ndk-$VER.
cd $GECKO_PATH

Просмотреть файл

@ -4,9 +4,7 @@ set -x -e -v
# This script is for fetching and repacking the Android SDK (for
# Linux), the tools required to produce Android packages.
UPLOAD_DIR=$HOME/project/gecko/android-sdk
mkdir -p $HOME/artifacts $UPLOAD_DIR
mkdir -p $UPLOAD_DIR
# Populate /builds/worker/.mozbuild/android-sdk-linux.
cd $GECKO_PATH

Просмотреть файл

@ -5,9 +5,8 @@ set -x -e -v
# Linux), the tools required to produce Android packages.
AVD_JSON_CONFIG="$1"
UPLOAD_DIR=$HOME/project/gecko/android-system-images
mkdir -p $HOME/artifacts $UPLOAD_DIR
mkdir -p $UPLOAD_DIR
# Populate /builds/worker/.mozbuild/android-sdk-linux.
cd $GECKO_PATH

Просмотреть файл

@ -4,10 +4,9 @@ set -x -e -v
# This script is for fetching and repacking the OpenJDK (for
# Linux)
UPLOAD_DIR=$HOME/project/gecko/jdk
AVD_JSON_CONFIG="$1"
mkdir -p $HOME/artifacts $UPLOAD_DIR
mkdir -p $UPLOAD_DIR
# Populate /builds/worker/.mozbuild/jdk
cd $GECKO_PATH