Skip to content

Use WORKITEM_ROOT instead of CORRELATIONPAYLOAD for helix workloads #9187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Use WORKITEM_ROOT instead of CORRELATIONPAYLOAD for helix workloads #9187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
314a8ad
UseDifferentRoot
jkotalik Apr 8, 2019
8099cee
another folder
jkotalik Apr 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions eng/helix/vstest/runtests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ fi
# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
chmod +x "dotnet-install.sh"; sync

./dotnet-install.sh --version $2 --install-dir $HELIX_CORRELATION_PAYLOAD/sdk
./dotnet-install.sh --version $2 --install-dir $HELIX_WORKITEM_ROOT/sdk
if [ $? -ne 0 ]; then
sdk_retries=3
while [ $sdk_retries -gt 0 ]; do
./dotnet-install.sh --version $2 --install-dir $HELIX_CORRELATION_PAYLOAD/sdk
./dotnet-install.sh --version $2 --install-dir $HELIX_WORKITEM_ROOT/sdk
if [ $? -ne 0 ]; then
let sdk_retries=sdk_retries-1
echo -e "${YELLOW}Failed to install .NET Core SDK $version. Retries left: $sdk_retries.${RESET}"
Expand All @@ -30,11 +30,11 @@ if [ $? -ne 0 ]; then
done
fi

./dotnet-install.sh --runtime dotnet --version $3 --install-dir $HELIX_CORRELATION_PAYLOAD/sdk
./dotnet-install.sh --runtime dotnet --version $3 --install-dir $HELIX_WORKITEM_ROOT/sdk
if [ $? -ne 0 ]; then
runtime_retries=3
while [ $runtime_retries -gt 0 ]; do
./dotnet-install.sh --runtime dotnet --version $3 --install-dir $HELIX_CORRELATION_PAYLOAD/sdk
./dotnet-install.sh --runtime dotnet --version $3 --install-dir $HELIX_WORKITEM_ROOT/sdk
if [ $? -ne 0 ]; then
let runtime_retries=runtime_retries-1
echo -e "${YELLOW}Failed to install .NET Core runtime $version. Retries left: $runtime_retries.${RESET}"
Expand All @@ -47,7 +47,7 @@ fi
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1

# Ensures every invocation of dotnet apps uses the same dotnet.exe
export DOTNET_ROOT="$HELIX_CORRELATION_PAYLOAD/sdk"
export DOTNET_ROOT="$HELIX_WORKITEM_ROOT/sdk"

# Ensure dotnet comes first on PATH
export PATH="$DOTNET_ROOT:$PATH"
Expand All @@ -56,7 +56,7 @@ export PATH="$DOTNET_ROOT:$PATH"
export DOTNET_MULTILEVEL_LOOKUP=0

# Avoid contaminating userprofiles
export DOTNET_CLI_HOME="$HELIX_CORRELATION_PAYLOAD/home"
export DOTNET_CLI_HOME="$HELIX_WORKITEM_ROOT/home"

export helix="$4"

Expand Down
2 changes: 1 addition & 1 deletion eng/targets/Helix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<HelixAvailibleTargetQueue Include="Debian.8.Amd64.Open" Platform="Linux" />
<HelixAvailibleTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
<HelixAvailibleTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
<HelixAvailibleTargetQueue Include="Fedora.28.Amd64.Open" Platform="Linux" />
<HelixAvailibleTargetQueue Include="\(Fedora.28.Amd64\)ubuntu.1604.amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-helix-45b1fa2-20190402012449" Platform="Linux" />

<!-- TODO: re-enable Debian.9.Arm64.Open and Ubuntu.1804.Arm64.Open -->
</ItemGroup>
Expand Down