From 6c095a79777af63568fc403a524250a1346b48c4 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Thu, 23 May 2019 11:40:50 +0100 Subject: [PATCH] Use a single location for the dotnet-packages artifacts (follows CA-251400). Signed-off-by: Konstantina Chremmou --- Jenkinsfile | 4 +--- packages/DOTNET_BUILD_LOCATION | 2 +- packages/DOTNET_BUILD_LOCATION_CTXSIGN | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 packages/DOTNET_BUILD_LOCATION_CTXSIGN diff --git a/Jenkinsfile b/Jenkinsfile index 86966c724..45b03e1de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -166,11 +166,9 @@ node("${params.BUILD_ON_NODE}") { ).trim() stage('Download dependencies') { - GString dotNetFile = GString.EMPTY - dotNetFile += (CTX_SIGN_DEFINED == '1') ? 'DOTNET_BUILD_LOCATION_CTXSIGN' : 'DOTNET_BUILD_LOCATION' GString remoteDotnet = GString.EMPTY - remoteDotnet += readFile("${env.WORKSPACE}\\xenadmin.git\\packages\\${dotNetFile}").trim() + remoteDotnet += readFile("${env.WORKSPACE}\\xenadmin.git\\packages\\DOTNET_BUILD_LOCATION").trim() GString downloadSpec = GString.EMPTY downloadSpec += readFile("${env.WORKSPACE}\\xenadmin.git\\mk\\deps-map.json").trim().replaceAll("@REMOTE_DOTNET@", remoteDotnet) diff --git a/packages/DOTNET_BUILD_LOCATION b/packages/DOTNET_BUILD_LOCATION index fcd05bed7..a42cd9005 100644 --- a/packages/DOTNET_BUILD_LOCATION +++ b/packages/DOTNET_BUILD_LOCATION @@ -1 +1 @@ -xc-local-release/dotnet-packages/master/22 +xc-local-release/dotnet-packages-ctxsign/master/22 diff --git a/packages/DOTNET_BUILD_LOCATION_CTXSIGN b/packages/DOTNET_BUILD_LOCATION_CTXSIGN deleted file mode 100644 index a42cd9005..000000000 --- a/packages/DOTNET_BUILD_LOCATION_CTXSIGN +++ /dev/null @@ -1 +0,0 @@ -xc-local-release/dotnet-packages-ctxsign/master/22