diff --git a/Jenkinsfile b/Jenkinsfile index c7a123b33..07ec22131 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -201,7 +201,7 @@ node("${params.BUILD_ON_NODE}") { } stage('Create manifest') { - GString manifestFile = "${env.WORKSPACE}\\output\\manifest" + GString manifestFile = "${env.WORKSPACE}\\output\\xenadmin-manifest.txt" File file = new File(manifestFile) String branchInfo = (params.XC_BRANCH == 'master') ? 'trunk' : params.XC_BRANCH @@ -236,7 +236,7 @@ node("${params.BUILD_ON_NODE}") { file << "xencenter-ovf xencenter-ovf.git 21d3d7a7041f15abfa73f916e5fd596fd7e610c4\n" file << "chroot-lenny chroots.hg 1a75fa5848e8\n" - file << readFile("${env.WORKSPACE}\\scratch\\dotnet-packages-manifest").trim() + file << readFile("${env.WORKSPACE}\\scratch\\dotnet-packages-manifest.txt").trim() } stage('Run checks') { diff --git a/mk/deps-map.json b/mk/deps-map.json index 3fa865e1a..69993e332 100644 --- a/mk/deps-map.json +++ b/mk/deps-map.json @@ -1,8 +1,8 @@ { "files": [ { - "pattern": "@REMOTE_DOTNET@/manifest", - "target": "scratch/dotnet-packages-manifest", + "pattern": "@REMOTE_DOTNET@/dotnet-packages-manifest.txt", + "target": "scratch/", "flat": "true" }, { diff --git a/packages/DOTNET_BUILD_LOCATION b/packages/DOTNET_BUILD_LOCATION index 7d0321ddd..ccd11b042 100644 --- a/packages/DOTNET_BUILD_LOCATION +++ b/packages/DOTNET_BUILD_LOCATION @@ -1 +1 @@ -xc-local-release/dotnet-packages/master/20 +xc-local-release/dotnet-packages/master/21