Skip to content
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

Adding stage and phase attempt for unified pipeline #10296

Merged
merged 2 commits into from
May 3, 2019
Merged

Adding stage and phase attempt for unified pipeline #10296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
662d60f
Adding stage and phase attempt
May 2, 2019
f1b8ca7
Merge branch 'master' into users/utgoswam/addingStageAndPhaseAttempt
May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tasks/PublishTestResultsV2/make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"externals": {
"archivePackages": [
{
"url": "https://publishtestresults.blob.core.windows.net/publishtestresults/9335686/PublishTestResults.zip",
"url": "https://publishtestresults.blob.core.windows.net/publishtestresults/9388984/PublishTestResults.zip",
"dest": "./"
}
]
Expand Down
2 changes: 2 additions & 0 deletions Tasks/PublishTestResultsV2/publishtestresultstool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ export class TestResultsPublisher {
envVars = this.addToProcessEnvVars(envVars, 'releaseuri', tl.getVariable('Release.ReleaseUri'));
envVars = this.addToProcessEnvVars(envVars, 'releaseenvironmenturi', tl.getVariable('Release.EnvironmentUri'));
envVars = this.addToProcessEnvVars(envVars, 'phasename', tl.getVariable('System.PhaseName'));
envVars = this.addToProcessEnvVars(envVars, 'phaseattempt', tl.getVariable('System.PhaseAttempt'));
envVars = this.addToProcessEnvVars(envVars, 'stagename', tl.getVariable('System.StageName'));
envVars = this.addToProcessEnvVars(envVars, 'stageattempt', tl.getVariable('System.StageAttempt'));
envVars = this.addToProcessEnvVars(envVars, 'jobname', tl.getVariable('System.JobName'));
envVars = this.addToProcessEnvVars(envVars, 'jobattempt', tl.getVariable('System.JobAttempt'));
envVars = this.addToProcessEnvVars(envVars, 'jobidentifier', tl.getVariable('System.JobIdentifier'));
Expand Down
2 changes: 1 addition & 1 deletion Tasks/PublishTestResultsV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 152,
"Patch": 0
"Patch": 1
},
"demands": [],
"releaseNotes": "<ul><li>NUnit3 support</li><li>Support for Minimatch files pattern</li></ul>",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/PublishTestResultsV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 2,
"Minor": 152,
"Patch": 0
"Patch": 1
},
"demands": [],
"releaseNotes": "ms-resource:loc.releaseNotes",
Expand Down
4 changes: 3 additions & 1 deletion Tasks/VsTestV2/inputdatacontract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ export interface TfsSpecificSettings {
ReleaseEnvironmentUri : string;
WorkFolder : string;
PhaseName : string;
PhaseAttempt : number;
StageName : string;
StageAttempt : number;
JobName : string;
JobAttempt : string;
JobAttempt : number;
}

export interface TestSpecificSettings {
Expand Down
4 changes: 3 additions & 1 deletion Tasks/VsTestV2/inputparser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,11 @@ function getTfsSpecificSettings(inputDataContract : idc.InputDataContract) : idc
inputDataContract.TfsSpecificSettings.ReleaseEnvironmentUri = tl.getVariable('Release.EnvironmentUri');
inputDataContract.TfsSpecificSettings.WorkFolder = tl.getVariable('System.DefaultWorkingDirectory');
inputDataContract.TfsSpecificSettings.PhaseName = tl.getVariable('System.PhaseName');
inputDataContract.TfsSpecificSettings.PhaseAttempt = utils.Helper.isNullEmptyOrUndefined(tl.getVariable('System.PhaseAttempt')) ? null : Number(tl.getVariable('System.PhaseAttempt'));
inputDataContract.TfsSpecificSettings.StageName = tl.getVariable('System.StageName');
inputDataContract.TfsSpecificSettings.StageAttempt = utils.Helper.isNullEmptyOrUndefined(tl.getVariable('System.StageAttempt')) ? null : Number(tl.getVariable('System.StageAttempt'));
inputDataContract.TfsSpecificSettings.JobName = tl.getVariable('System.JobName');
inputDataContract.TfsSpecificSettings.JobAttempt = tl.getVariable('System.JobAttempt');
inputDataContract.TfsSpecificSettings.JobAttempt = utils.Helper.isNullEmptyOrUndefined(tl.getVariable('System.JobAttempt')) ? null : Number(tl.getVariable('System.JobAttempt'));

ShreyasRmsft marked this conversation as resolved.
Show resolved Hide resolved
return inputDataContract;
}
Expand Down
2 changes: 1 addition & 1 deletion Tasks/VsTestV2/make.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dest": "./"
},
{
"url": "https://testexecution.blob.core.windows.net/testexecution/9372296/TestAgent.zip",
"url": "https://testexecution.blob.core.windows.net/testexecution/9388984/TestAgent.zip",
"dest": "./Modules"
},
{
Expand Down
2 changes: 1 addition & 1 deletion Tasks/VsTestV2/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 2,
"Minor": 152,
"Patch": 1
"Patch": 2
},
"demands": [
"vstest"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/VsTestV2/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": {
"Major": 2,
"Minor": 152,
"Patch": 1
"Patch": 2
},
"demands": [
"vstest"
Expand Down