[ci] Get rid of remaining usages of WORKSPACE env var

Most of it was already removed in ea519ada8c38cae67f56e27ca70d32923ce9f23a

diff --git a/packaging/Windows/defs/mono b/packaging/Windows/defs/mono
index 0aec09d9ea3aaf55b04eb5283fd72ed6f540e9cd..aa7f81f83400cc76e2150b4d3331fbc960d43d7f 100755 (executable)
--- a/packaging/Windows/defs/mono
+++ b/packaging/Windows/defs/mono
@@ -29,7 +29,7 @@ build()
        pushd ${REPODIR}
        report "Building Mono"
        mkdir -p ${INSTALLDIR}
-       WORKSPACE=${REPODIR} EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" ghprbPullId=1 CI_TAGS="no-tests" label="w32" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***"
+       EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" CI_TAGS="no-tests" label="w32" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***"
        popd
 }
 

diff --git a/packaging/Windows/defs/mono64 b/packaging/Windows/defs/mono64
index bdfaabbbfacf0bd7f31680ce8e52691b1ee844f6..2d7dcc5f8d852b91b05fa4a9552a9b24f74c7731 100755 (executable)
--- a/packaging/Windows/defs/mono64
+++ b/packaging/Windows/defs/mono64
@@ -29,7 +29,7 @@ build()
        pushd ${REPODIR}
        report "Building Mono"
        mkdir -p ${INSTALLDIR}
-       WORKSPACE=${REPODIR} EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" ghprbPullId=1 CI_TAGS="no-tests" label="w64" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***"
+       EXTRA_CONF_FLAGS="--prefix=${INSTALLDIR}" CI_TAGS="no-tests" label="w64" scripts/ci/run-jenkins.sh || error "*** Could not run autogen ***"
        popd
 }
 

diff --git a/scripts/ci/run-test-acceptance-tests.sh b/scripts/ci/run-test-acceptance-tests.sh
index 91e16caf6b878bb836f8eeb9ced7f1c568adbb24..5b35712b610c206b725fbdd4ca833d15472da736 100755 (executable)
--- a/scripts/ci/run-test-acceptance-tests.sh
+++ b/scripts/ci/run-test-acceptance-tests.sh
@@ -10,7 +10,7 @@ if [ "$total_tests" -lt "1600" ]
        exit 1
 fi
 
-${TESTCMD} --label=check-roslyn --timeout=30m make -C acceptance-tests check-roslyn PREFIX=${WORKSPACE}/tmp/mono-acceptance-tests
+${TESTCMD} --label=check-roslyn --timeout=30m make -C acceptance-tests check-roslyn PREFIX=${MONO_REPO_ROOT}/tmp/mono-acceptance-tests
 rm -rf ${MONO_REPO_ROOT}/tmp/mono-acceptance-tests  # cleanup the Mono installation used for Roslyn tests
 
 ${TESTCMD} --label=coreclr-compile-tests --timeout=80m --fatal make -C acceptance-tests coreclr-compile-tests