From 1129c8982f44358076c5a3cb8803f8d3a46574bf Mon Sep 17 00:00:00 2001 From: = Date: Thu, 23 May 2019 18:21:49 -0700 Subject: [PATCH 1/7] Make it so Helix runs can be rerun and preserve history R2 --- eng/helix/helix.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index 9274e5a6df..a722550754 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -19,7 +19,7 @@ ci aspnetcore - $(BUILD_BUILDNUMBER) + $(BUILD_BUILDNUMBER).$(BUILD_BUILDID) true true true From 264ab5252fc73389274fd9b422b0fef0f7d48899 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 4 Jun 2019 19:28:40 -0700 Subject: [PATCH 2/7] Try again --- .azure/pipelines/helix-test.yml | 1 + eng/helix/helix.proj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index 1b512109b1..25b4bee447 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -19,6 +19,7 @@ jobs: displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops + PIPELINE_BUILD_COUNTER: $[counter(format('{0:yyyyMMdd}', pipeline.startTime), 1)] artifacts: - name: Helix_logs path: artifacts/log/ diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index a722550754..1a1c70f375 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -19,7 +19,7 @@ ci aspnetcore - $(BUILD_BUILDNUMBER).$(BUILD_BUILDID) + $(BUILD_BUILDNUMBER).$(PIPELINE_BUILD_COUNTER) true true true From 87197362825242ded1c3d65880a074301193d709 Mon Sep 17 00:00:00 2001 From: = Date: Wed, 5 Jun 2019 00:45:13 -0700 Subject: [PATCH 3/7] Try again --- .azure/pipelines/helix-test.yml | 4 +++- eng/helix/helix.proj | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index 25b4bee447..a642f3e2b7 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -14,12 +14,14 @@ jobs: jobDisplayName: 'Tests: Helix' agentOs: Windows timeoutInMinutes: 240 + variables: + HelixBuildCounter: $[counter(format('{0:yyyyMMdd}', pipeline.startTime), 1)] steps: - script: .\build.cmd -all -ci /p:BuildNative=true /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\SendToHelix.binlog displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops - PIPELINE_BUILD_COUNTER: $[counter(format('{0:yyyyMMdd}', pipeline.startTime), 1)] + HELIX_BUILD_COUNTER: $(HelixBuildCounter) artifacts: - name: Helix_logs path: artifacts/log/ diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index 1a1c70f375..f96cb3920e 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -19,7 +19,7 @@ ci aspnetcore - $(BUILD_BUILDNUMBER).$(PIPELINE_BUILD_COUNTER) + $(BUILD_BUILDNUMBER).$(HELIX_BUILD_COUNTER) true true true From fba5c7b4c53a7bf4d5ef58b72324771c9accdf67 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 5 Jun 2019 13:54:52 -0700 Subject: [PATCH 4/7] Use raw time instead of counter --- .azure/pipelines/helix-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index a642f3e2b7..105b3deabd 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -15,7 +15,7 @@ jobs: agentOs: Windows timeoutInMinutes: 240 variables: - HelixBuildCounter: $[counter(format('{0:yyyyMMdd}', pipeline.startTime), 1)] + HelixBuildCounter: $[format('{0:HH.mm}', pipeline.startTime)] steps: - script: .\build.cmd -all -ci /p:BuildNative=true /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\SendToHelix.binlog displayName: Run build.cmd helix target From b1d449a1dea095a858325e9f9c9e11eb3d756c52 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 5 Jun 2019 16:14:11 -0700 Subject: [PATCH 5/7] How about this? --- .azure/pipelines/helix-test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index 105b3deabd..a8da769180 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -14,14 +14,12 @@ jobs: jobDisplayName: 'Tests: Helix' agentOs: Windows timeoutInMinutes: 240 - variables: - HelixBuildCounter: $[format('{0:HH.mm}', pipeline.startTime)] steps: - script: .\build.cmd -all -ci /p:BuildNative=true /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\SendToHelix.binlog displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops - HELIX_BUILD_COUNTER: $(HelixBuildCounter) + HELIX_BUILD_COUNTER: $(Hours).$(Minutes) artifacts: - name: Helix_logs path: artifacts/log/ From e140658bcfb5e9cbe3e10697f6da243de5671434 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 5 Jun 2019 18:41:12 -0700 Subject: [PATCH 6/7] wip --- .azure/pipelines/helix-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index a8da769180..62a8d267e6 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -14,12 +14,14 @@ jobs: jobDisplayName: 'Tests: Helix' agentOs: Windows timeoutInMinutes: 240 + variables: + HelixBuildCounter: $[pipeline.startTime] steps: - script: .\build.cmd -all -ci /p:BuildNative=true /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\SendToHelix.binlog displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops - HELIX_BUILD_COUNTER: $(Hours).$(Minutes) + HELIX_BUILD_COUNTER: $(HelixBuildCounter) artifacts: - name: Helix_logs path: artifacts/log/ From 24eb5e61d5c2997602816ecfa8cf61f01bbe14db Mon Sep 17 00:00:00 2001 From: John Luo Date: Thu, 6 Jun 2019 10:56:56 -0700 Subject: [PATCH 7/7] Use Envvar --- .azure/pipelines/helix-test.yml | 3 --- eng/helix/helix.proj | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml index 62a8d267e6..1b512109b1 100644 --- a/.azure/pipelines/helix-test.yml +++ b/.azure/pipelines/helix-test.yml @@ -14,14 +14,11 @@ jobs: jobDisplayName: 'Tests: Helix' agentOs: Windows timeoutInMinutes: 240 - variables: - HelixBuildCounter: $[pipeline.startTime] steps: - script: .\build.cmd -all -ci /p:BuildNative=true /t:Helix /p:IsHelixJob=true /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\SendToHelix.binlog displayName: Run build.cmd helix target env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops - HELIX_BUILD_COUNTER: $(HelixBuildCounter) artifacts: - name: Helix_logs path: artifacts/log/ diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index f96cb3920e..7304dd629a 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -19,7 +19,7 @@ ci aspnetcore - $(BUILD_BUILDNUMBER).$(HELIX_BUILD_COUNTER) + $(BUILD_BUILDNUMBER).$(SYSTEM_JOBATTEMPT) true true true