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

Jump to bottom

Users/shreyas r msft/input parser migration #7021

Merged

ShreyasRmsft merged 12 commits into master from users/ShreyasRMsft/inputParserMigration

May 10, 2018

Member

ShreyasRmsft commented Apr 18, 2018

No description provided.

ShreyasRmsft added 2 commits

April 17, 2018 17:51


          initial commit

8ec0d87


          code removed from task input parser

fefeef4

ShreyasRmsft commented

View reviewed changes

Tasks/VsTest/models.ts Outdated

		@@ -1,4 +1,5 @@
		import * as version from './vstestversion';
		import { InputDataContract } from './inputdatacontract';

Member Author

ShreyasRmsft Apr 18, 2018

will remove this

ShreyasRmsft commented

View reviewed changes

Tasks/VsTest/taskinputparser.ts Outdated

                   }
+                  console.log(tl.loc('dtaNumberOfAgents', inputDataContract.DistributionSettings.NumberOfTestAgents));
+                  const distributionType = tl.getInput('distributionBatchType');

Member Author

ShreyasRmsft Apr 18, 2018

move this to dta

ShreyasRmsft commented

View reviewed changes

Tasks/VsTest/taskinputparser.ts Outdated

+                      const distributeByAgentsOption = tl.getInput('batchingBasedOnAgentsOption');
+                      if (distributeByAgentsOption && distributeByAgentsOption === 'customBatchSize') {
+                          const batchSize = parseInt(tl.getInput('customBatchSizeValue'));
+                          if (!isNaN(batchSize) && batchSize > 0) {

Member Author

ShreyasRmsft Apr 18, 2018

do we want to do thjis here?

ShreyasRmsft commented

View reviewed changes

Tasks/VsTest/taskinputparser.ts Outdated

+                  const rerunType = tl.getInput('rerunType') || 'basedOnTestFailurePercentage';
+                  // hydra: unravel the nestings
+                  if (rerunType === 'basedOnTestFailureCount') {

Member Author

ShreyasRmsft Apr 18, 2018

switching off rerun logic to dta executiion host?

ShreyasRmsft added 5 commits

April 20, 2018 11:40


          fixed all task side code

6c4ed46


          E2E working

a01b420


          moved relevant code to managed layer

4acc27d


          reverted changes to tslint.json

de7c6ce


          modularized input parser

a857cc0

nigurr reviewed

View reviewed changes

Tasks/VsTest/distributedtest.ts Outdated

@@ @@ -31,8 +31,10 @@ export class DistributedTest { @@
                   }
                   private publishCodeChangesIfRequired(): void {
-                      if (this.dtaTestConfig.tiaConfig.tiaEnabled) {
-                          const code = testSelector.publishCodeChanges(this.dtaTestConfig.tiaConfig, this.dtaTestConfig.proxyConfiguration, null, this.dtaTestConfig.taskInstanceIdentifier);
+                      if (this.inputDataContract.ExecutionSettings.TiaSettings.Enabled) {

nigurr May 7, 2018

null check

Member Author

ShreyasRmsft May 10, 2018

done

nigurr reviewed

View reviewed changes

Tasks/VsTest/distributedtest.ts Outdated

+                      const envVars: { [key: string]: string; } = process.env; // This is a temporary solution where we are passing parent process env vars, we should get away from this
+                      this.inputDataContract.TestSelectionSettings.TestSourcesFile = this.createTestSourcesFile();
+                      // Temporary solution till this logic can move to the test platform itself
+                      if (this.inputDataContract.UsingXCopyTestPlatformPackage) {

nigurr May 7, 2018

seperate method

nigurr reviewed

View reviewed changes

Tasks/VsTest/distributedtest.ts Outdated

-                      const envVars: { [key: string]: string; } = process.env; // This is a temporary solutio where we are passing parent process env vars, we should get away from this
-                      utils.Helper.addToProcessEnvVars(envVars, 'DTA.AccessToken', this.dtaTestConfig.dtaEnvironment.patToken);
+                      utils.Helper.addToProcessEnvVars(envVars, 'DTA.AccessToken', this.inputDataContract.AccessToken);
+                      this.inputDataContract.AccessToken = null;

nigurr May 7, 2018

not required?

Member Author

ShreyasRmsft May 7, 2018

setting it back to null. This is required

nigurr reviewed

View reviewed changes

Tasks/VsTest/distributedtest.ts Outdated

-                      DistributedTest.removeEmptyNodes(inputDataContract);
-                      writeFileSync(inputFilePath, JSON.stringify(inputDataContract));
+                      DistributedTest.removeEmptyNodes(this.inputDataContract);
+                      writeFileSync(inputFilePath, JSON.stringify(this.inputDataContract));

nigurr May 7, 2018

meaningful error? and telemetry


          fixed stuff

a85033c

nigurr reviewed

View reviewed changes

Tasks/VsTest/distributedtest.ts Outdated

@@ @@ -290,8 +165,8 @@ export class DistributedTest { @@
                   private cleanUpDtaExeHost() {
                       try {
-                          if (this.testSourcesFile) {
-                              tl.rmRF(this.testSourcesFile);
+                          if (this.inputDataContract.TestSelectionSettings.TestSourcesFile) {

nigurr May 7, 2018

do we really require as now we are using AGENT.TEMP?

Member Author

ShreyasRmsft May 7, 2018

removed this

nigurr reviewed

View reviewed changes

Tasks/VsTest/distributedtest.ts Outdated

+                          let sourceFilter = tl.getDelimitedInput('testAssemblyVer2', '\n', true);
+                          if (this.inputDataContract.TestSelectionSettings.TestSelectionType.toLowerCase() !== 'testassemblies') {
+                              sourceFilter = ['**\\*', '!**\\obj\\*'];

nigurr May 7, 2018

how many times we are searching? I am assuming we are only searching once from the task and passing it to DTAExecutionHost all the list of file inputs. for both testplan/test assembly sceanrio

Member Author

ShreyasRmsft May 7, 2018

We had been doing this replication from some time now. Will have to go ahead and remove it from the C# layer

nigurr reviewed

View reviewed changes

Tasks/VsTest/task.json Outdated

@@ @@ -16,8 +16,8 @@ @@
                   "author": "Microsoft Corporation",
                   "version": {
                       "Major": 2,
-                      "Minor": 5,
-                      "Patch": 6
+                      "Minor": 134,

nigurr May 7, 2018

??

change it 2.6.0

Member Author

ShreyasRmsft May 7, 2018

was considering setting it to sprint number. Just a thought

Member

prawalagarwal May 9, 2018

I vote for sprint number too

Member Author

ShreyasRmsft May 10, 2018

will ask shiva and finalize

nigurr reviewed

View reviewed changes

Tasks/VsTest/testselectorinvoker.ts

@@ @@ -106,6 +107,109 @@ export class TestSelectorInvoker { @@
                       return output.code;
                   }
+                  public publishCodeChangesInDistributedMode(inputDataContract: inputdatacontract.InputDataContract): number {

nigurr May 7, 2018

get it reviewed with praga

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts


		taskinputparser.logWarningForWER(tl.getBoolInput('uiTests'));

		inputDataContract.UseNewCollector = false;

nigurr May 7, 2018

tiaNewCollector

Member Author

ShreyasRmsft May 10, 2018

temp var. leaving it as it is for now. Will remove in the next testselector pr

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts Outdated

+                  inputDataContract.TeamProject = tl.getVariable('System.TeamProject');
+                  inputDataContract.VstestTaskInstanceIdentifier = uuid.v1();
+                  inputDataContract.UseVsTestConsole = false;

nigurr May 7, 2018

remove this

Member Author

ShreyasRmsft May 10, 2018

done

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts Outdated

+                  inputDataContract.RunIdentifier = getRunIdentifier();
+                  //hydra: do we need
+                  //dtaEnvironment.dtaHostLogFilePath = path.join(tl.getVariable('System.DefaultWorkingDirectory'), 'DTAExecutionHost.exe.log');

nigurr May 7, 2018

remove this

Member Author

ShreyasRmsft May 10, 2018

done

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts

+              }
+              function getTestSelectionInputs(inputDataContract : idc.InputDataContract) : idc.InputDataContract {
+                  inputDataContract.TestSelectionSettings = <idc.TestSelectionSettings>{};

nigurr May 7, 2018

check this works in Node 5?

Member Author

ShreyasRmsft May 10, 2018

done

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts Outdated

+                  if (vsTestLocationMethod === utils.Constants.vsTestVersionString) {
+                      const vsTestVersion = tl.getInput('vsTestVersion');
+                      if (utils.Helper.isNullEmptyOrUndefined(vsTestVersion)) {
+                          console.log('vsTestVersion is null or empty');

nigurr May 7, 2018

localize

Member Author

ShreyasRmsft May 10, 2018

done

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts

+                  } else {
+                      // hydra: should it be full path or directory above?
+                      inputDataContract.VsTestConsolePath = tl.getInput('vsTestLocation');
+                      console.log(tl.loc('vstestLocationSpecified', 'vstest.console.exe', inputDataContract.VsTestConsolePath));

nigurr May 7, 2018

VsTools path -> check what's the path
Vstest.console.exe path -> vs 2015 [IDE]
vstest.console.exe path -> vs 15.5
vstest.console.exe path -> 15.6 > [\Extensions\TestWindow]

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts Outdated

+                  const distributionType = tl.getInput('distributionBatchType');
+                  if (distributionType && distributionType === 'basedOnTestCases') {
+                      inputDataContract.DistributionSettings.TestCaseLevelSlicingEnabled = true;

nigurr May 7, 2018

do the naming change

Member Author

ShreyasRmsft May 10, 2018

done

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts Outdated

+                  console.log(tl.loc('runInParallelInput', inputDataContract.ExecutionSettings.AssemblyLevelParallelism));
+                  // hydra: valid only for console flow
+                  //inputDataContract.ExecutionSettings.runTestsInIsolation = tl.getBoolInput('runTestsInIsolation');

nigurr May 7, 2018

these should exist

Member Author

ShreyasRmsft May 10, 2018

added back

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts Outdated

+                  // hydra: console flow only
+                  //testConfiguration.otherConsoleOptions = tl.getInput('otherConsoleOptions');
+                  //console.log(tl.loc('otherConsoleOptionsInput', testConfiguration.otherConsoleOptions));\

nigurr May 7, 2018

keep them

Member Author

ShreyasRmsft May 10, 2018

done

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts Outdated

+                  inputDataContract.ExecutionSettings.TiaSettings.FileLevel = getTIALevel(tl.getVariable('tia.filelevel'));
+                  inputDataContract.ExecutionSettings.TiaSettings.SourcesDirectory = tl.getVariable('build.sourcesdirectory');
+                  inputDataContract.ExecutionSettings.TiaSettings.FilterPaths = tl.getVariable('TIA_IncludePathFilters');
+                  // hydra: inputDataContract.ExecutionSettings.TiaSettings.runIdFile = path.join(os.tmpdir(), uuid.v1() + '.txt');

nigurr May 7, 2018

unless testselector tool code is fixed.

Member Author

ShreyasRmsft May 10, 2018

not being used today.

nigurr reviewed

View reviewed changes

Tasks/VsTest/inputparser.ts

+                      tl.debug('Searching for latest Visual Studio');
+                      const vstestconsole15Path = versionfinder.getVSTestConsole15Path();
+                      if (vstestconsole15Path) {
+                          vsTestVersion = '15.0';

nigurr May 7, 2018

remove line

nigurr May 7, 2018

check for manual vstest.console.exe path where cx can give full path or dir

Member Author

ShreyasRmsft May 10, 2018

done in the invoking function above

prawalagarwal reviewed

View reviewed changes

Tasks/VsTest/testselectorinvoker.ts

@@ @@ -106,6 +107,109 @@ export class TestSelectorInvoker { @@
                       return output.code;
                   }
+                  public publishCodeChangesInDistributedMode(inputDataContract: inputdatacontract.InputDataContract): number {

Member

prawalagarwal May 9, 2018

Help me understand this. Why did we create a new invoker for distributed?

Member Author

ShreyasRmsft May 10, 2018

because inputs need to come from inputdatacontract which currently does not exist for single agent flow.

ShreyasRmsft added 2 commits

May 10, 2018 11:45


          fixed minor version to reflect sprint

006ec12


          Merge branch 'master' into users/ShreyasRMsft/inputParserMigration

nigurr approved these changes

View reviewed changes

ShreyasRmsft added 2 commits

May 10, 2018 13:49


          updated packages

4af096e


          merged cahnges

1c05662

ShreyasRmsft merged commit c4f7c03 into master

ShreyasRmsft deleted the users/ShreyasRMsft/inputParserMigration branch

November 28, 2018 08:45

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet