From 036c2c06cf3bc0746891cf5684e8c31ad7c5ff41 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 15 Mar 2017 18:17:15 -0700 Subject: [PATCH] Revert "Add support for Multiqueing jobs in Helix" --- tests/helixpublish.proj | 132 +++++++++------------ .../build_against_pkg_dependencies/project.json | 3 +- tests/src/Common/test_dependencies/project.json | 3 +- 3 files changed, 56 insertions(+), 82 deletions(-) diff --git a/tests/helixpublish.proj b/tests/helixpublish.proj index f19b2a7..699e220 100644 --- a/tests/helixpublish.proj +++ b/tests/helixpublish.proj @@ -1,97 +1,73 @@ - - - - + + - - DefaultEndpointsProtocol=https;AccountName=$(CloudDropAccountName);AccountKey=$(CloudDropAccessToken);EndpointSuffix=core.windows.net - DefaultEndpointsProtocol=https;AccountName=$(CloudResultsAccountName);AccountKey=$(CloudResultsAccessToken);EndpointSuffix=core.windows.net - - - $(TestWorkingDir)/archive - $(ArchivesRoot)/tests - - $(TestRunnerScript) - $(TestWorkingDir)SupplementalPayload/ - - - - 1000 - - - true - $([System.DateTime]::Now.ToString(yyyyMMdd.mmss)) - - test/functional/cli/ - - official/$(TestProduct)/$(Branch)/ - pr/$(TestProduct)/$(Branch)/ - pr/unknown/ - - - $(ArchivesRoot)/ - - - $(CurrentDate) - $(OfficialBuildId) - $(Platform) - $(ConfigurationGroup) + <__BuildType>$(ConfigurationGroup) - - - - %HELIX_PYTHONPATH% - %HELIX_CORRELATION_PAYLOAD%\RunnerScripts\scriptrunner\scriptrunner.py + + + + + + + + + + + + + + + true + Tests.$(ConfigurationGroup).json + $(TestWorkingDir)$(PayloadTestListFilename) - - $HELIX_PYTHONPATH - $HELIX_CORRELATION_PAYLOAD/RunnerScripts/scriptrunner/scriptrunner.py - + - - - - - + + $(Platform)$(ConfigurationGroup)/Packages.zip + + - - - + + + @(CorrelationPayloadUri) + + $(DropUri)$(Platform)$(ConfigurationGroup)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(CoreRootUri.Filename)%(CoreRootUri.Extension)$(DropUriReadOnlyToken) + $(CorrelationPayloadUris);$(CoreRootUris) + - - - $(Platform)$(ConfigurationGroup)/%(Identity) - - + + $(HelixPythonPath) $(RunnerScript) --script %HELIX_WORKITEM_PAYLOAD%\runtests.cmd chmod +x $HELIX_WORKITEM_PAYLOAD/runtests.sh && $(HelixPythonPath) $(RunnerScript) --script $HELIX_WORKITEM_PAYLOAD/runtests.sh - %(Identity) + [$(CorrelationPayloadProperty)] + $(DropUri)$(Platform)$(ConfigurationGroup)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(Filename)%(Extension)$(DropUriReadOnlyToken) %(Filename) $(TimeoutInSeconds) - $(Platform)-$(ConfigurationGroup)/Tests/$([System.String]::Copy('%(RecursiveDir)').Replace('\', '/'))%(Filename)%(Extension) - + + + + + + + $(PayloadTestListFilename) + + + + + + $(TestWorkingDir)$(OSPlatformConfig)/FuncBuildComplete.json + $(TestWorkingDir)$(OSPlatformConfig)/FuncOfficialBuild.json + $(TestWorkingDir)$(OSPlatformConfig)/helixjobuploadcomplete.sem + - - + - - - - - - - \ No newline at end of file diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json index 1ef22d1..fa2f8b7 100644 --- a/tests/src/Common/build_against_pkg_dependencies/project.json +++ b/tests/src/Common/build_against_pkg_dependencies/project.json @@ -26,7 +26,6 @@ "rhel.7-x64": {}, "debian.8-x64": {}, "fedora.23-x64": {}, - "opensuse.42.1-x64": {}, - "linux-x64": {} + "opensuse.42.1-x64": {} } } diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json index d12b7b5..7e59e0f 100644 --- a/tests/src/Common/test_dependencies/project.json +++ b/tests/src/Common/test_dependencies/project.json @@ -23,7 +23,6 @@ "centos.7-x64": {}, "rhel.7-x64": {}, "debian.8-x64": {}, - "fedora.23-x64": {}, - "linux-x64": {} + "fedora.23-x64": {} } } -- 2.7.4