Skip to content

Commit 889f6dc

Browse files
TravisEz13TravisEz13
committed
Revert "first try"
This reverts commit 9ec564e.
1 parent 9ec564e commit 889f6dc

4 files changed

Lines changed: 118 additions & 133 deletions

File tree

‎.vsts-ci/phase.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
condition: and( succeededOrFailed(), ne(variables['Channel'],''))
4646
4747
- pwsh: |
48-
./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-$(Channel)' ${{ parameters.ciParameter }} -Repository $(Channel)/powershell
48+
./build.ps1 -build -name '$(ImageName)' -IncludeKnownIssues -Channel '$(Channel)' -TestLogPostfix '$(ImageName)-stable' ${{ parameters.ciParameter }} -Repository stable/powershell
4949
displayName: $(ImageName) $(Channel)
5050
condition: and( succeededOrFailed(), ne(variables['Channel'],''))
5151
continueOnError: ${{ parameters.continueonerror }}

‎.vsts-ci/releasePhase.yml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
parameters:
22
pool: 'Hosted Ubuntu 1604'
3+
channel: 'stable'
34
jobName: 'none'
45
releaseTag: ''
56
ACR: 'no'
6-
maxParallel: 5
77

88
jobs:
99
- job: ${{ parameters.jobName }}
10-
dependsOn: ${{ parameters.dependsOn }}
11-
strategy:
12-
matrix: $[ ${{ parameters.matrix }} ]
13-
maxParallel: ${{ parameters.maxParallel }}
1410
variables:
1511
dockerImage: 'powershell'
1612
Channel: ${{ parameters.channel }}
@@ -48,7 +44,7 @@ jobs:
4844

4945
- pwsh: |
5046
az account set --subscription $(StorageSubscriptionName)
51-
$querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(1).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
47+
$querystring = az storage account generate-sas --account-name $(StorageAccount) --services b --resource-types o --expiry ((get-date).AddDays(2).ToString("yyyy-MM-dd")) --permission r --https-only | convertfrom-json
5248
$url = "https://$(StorageAccount).blob.core.windows.net/?$querystring"
5349
Write-Host "##vso[task.setvariable variable=SasUrl;]$url"
5450
displayName: 'Set SasUrl variable'
@@ -78,7 +74,7 @@ jobs:
7874
7975
if($env:$(Channel) -eq 'true')
8076
{
81-
./build.ps1 -Build -ImageName $(dockerHost) -name '$(ImageName)' -Channel $(channel) -TestLogPostfix '$(ImageName)-$(Channel)' @extraParams -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
77+
./build.ps1 -Build -ImageName $(dockerHost) -All -Channel $(channel) @extraParams -version '$(Version)' -Repository $(dockerNamespace)/$(dockerImage)
8278
}
8379
else
8480
{

‎.vsts-ci/releaseStage.yml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎.vsts-ci/releasebuild.yml‎

Lines changed: 114 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -7,89 +7,117 @@ resources:
77
variables:
88
POWERSHELL_TELEMETRY_OPTOUT: 1
99

10-
stages:
11-
- template: releaseStage.yml
12-
parameters:
13-
channel: stable
14-
- template: releaseStage.yml
15-
parameters:
16-
channel: preview
17-
18-
- stage: GenerateManifests
19-
- job: PreviewManifestPhase
20-
variables:
21-
releaseTag: $(previewReleaseTag)
22-
channel: PREVIEW
23-
24-
displayName: Create Preview Manifest Lists
25-
condition: succeededOrFailed()
26-
pool:
27-
name: PowerShell
28-
timeoutInMinutes: 30
29-
30-
steps:
31-
- template: manifestSteps.yml
32-
- job: StableManifestPhase
33-
variables:
34-
releaseTag: $(stableReleaseTag)
35-
channel: STABLE
36-
37-
displayName: Create Stable Manifest Lists
38-
39-
dependsOn:
40-
- stableWindows
41-
- stableLinux
42-
condition: succeededOrFailed()
43-
pool:
44-
name: PowerShell
45-
timeoutInMinutes: 30
46-
47-
steps:
48-
- template: manifestSteps.yml
49-
- stage: GenerateTagsYaml
50-
dependsOn: []
51-
- job: GenerateTagsYaml
52-
53-
displayName: Generate Tags YAML
54-
55-
condition: succeededOrFailed()
56-
pool:
57-
name: Hosted Ubuntu 1604
58-
timeoutInMinutes: 30
59-
60-
steps:
61-
- powershell: |
62-
$stableVersion = '$(stableReleaseTag)' -replace '^v', ''
63-
Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
64-
$previewVersion = '$(previewReleaseTag)' -replace '^v', ''
65-
Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
66-
displayName: 'Set Versions'
67-
68-
- powershell: 'Get-ChildItem env:'
69-
displayName: 'Capture Environment'
70-
71-
- powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
72-
displayName: 'Install Pester'
73-
74-
- powershell: |
75-
$yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
76-
$yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
77-
Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
78-
Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
79-
}
80-
displayName: Generate Tags YAML
81-
82-
- powershell: |
83-
$path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/releaseTags.json'
84-
@{
85-
'previewReleaseTag' = '$(previewReleaseTag)'
86-
'stableReleaseTag' = '$(stableReleaseTag)'
87-
}|convertto-json | out-file -FilePath $path -Encoding ascii
88-
Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
89-
displayName: Save release Tags
90-
91-
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
92-
displayName: 'Component Detection'
93-
inputs:
94-
sourceScanPath: '$(Build.SourcesDirectory)'
95-
snapshotForceEnabled: true
10+
jobs:
11+
- template: releasePhase.yml
12+
parameters:
13+
channel: STABLE
14+
jobName: stableLinux
15+
releaseTag: $(stableReleaseTag)
16+
pool: Hosted Ubuntu 1604
17+
ACR: no
18+
19+
- template: releasePhase.yml
20+
parameters:
21+
channel: PREVIEW
22+
jobName: previewLinux
23+
releaseTag: $(previewReleaseTag)
24+
pool: Hosted Ubuntu 1604
25+
ACR: no
26+
27+
- template: releasePhase.yml
28+
parameters:
29+
channel: STABLE
30+
jobName: stableWindows
31+
releaseTag: $(stableReleaseTag)
32+
pool: Hosted VS2017
33+
ACR: yes
34+
35+
- template: releasePhase.yml
36+
parameters:
37+
channel: PREVIEW
38+
jobName: previewWindows
39+
releaseTag: $(previewReleaseTag)
40+
pool: Hosted VS2017
41+
ACR: yes
42+
43+
- job: PreviewManifestPhase
44+
variables:
45+
releaseTag: $(previewReleaseTag)
46+
channel: PREVIEW
47+
48+
displayName: Create Preview Manifest Lists
49+
50+
dependsOn:
51+
- previewLinux
52+
- previewWindows
53+
condition: succeededOrFailed()
54+
pool:
55+
name: PowerShell
56+
timeoutInMinutes: 30
57+
58+
steps:
59+
- template: manifestSteps.yml
60+
61+
- job: StableManifestPhase
62+
variables:
63+
releaseTag: $(stableReleaseTag)
64+
channel: STABLE
65+
66+
displayName: Create Stable Manifest Lists
67+
68+
dependsOn:
69+
- stableWindows
70+
- stableLinux
71+
condition: succeededOrFailed()
72+
pool:
73+
name: PowerShell
74+
timeoutInMinutes: 30
75+
76+
steps:
77+
- template: manifestSteps.yml
78+
79+
- job: GenerateTagsYaml
80+
81+
displayName: Generate Tags YAML
82+
83+
condition: succeededOrFailed()
84+
pool:
85+
name: Hosted Ubuntu 1604
86+
timeoutInMinutes: 30
87+
88+
steps:
89+
- powershell: |
90+
$stableVersion = '$(stableReleaseTag)' -replace '^v', ''
91+
Write-Host "##vso[task.setvariable variable=StableVersion;]$stableVersion"
92+
$previewVersion = '$(previewReleaseTag)' -replace '^v', ''
93+
Write-Host "##vso[task.setvariable variable=PreviewVersion;]$previewVersion"
94+
displayName: 'Set Versions'
95+
96+
- powershell: 'Get-ChildItem env:'
97+
displayName: 'Capture Environment'
98+
99+
- powershell: 'Install-module pester -Scope CurrentUser -Force -SkipPublisherCheck'
100+
displayName: 'Install Pester'
101+
102+
- powershell: |
103+
$yaml = ./build.ps1 -GenerateTagsYaml -Channel stable, preview -StableVersion $(StableVersion) -PreviewVersion $(PreviewVersion)
104+
$yaml | Out-File -Encoding ascii -Path ./tagsmetadata.yaml
105+
Get-ChildItem -Path ./tagsmetadata.yaml | Select-Object -ExpandProperty FullName | ForEach-Object {
106+
Write-Host "##vso[artifact.upload containerfolder=artifacts;artifactname=artifacts]$_"
107+
}
108+
displayName: Generate Tags YAML
109+
110+
- powershell: |
111+
$path = '$(SYSTEM.DEFAULTWORKINGDIRECTORY)/releaseTags.json'
112+
@{
113+
'previewReleaseTag' = '$(previewReleaseTag)'
114+
'stableReleaseTag' = '$(stableReleaseTag)'
115+
}|convertto-json | out-file -FilePath $path -Encoding ascii
116+
Write-Host "##vso[artifact.upload containerfolder=releaseTags;artifactname=releaseTags]$path"
117+
displayName: Save release Tags
118+
119+
- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0
120+
displayName: 'Component Detection'
121+
inputs:
122+
sourceScanPath: '$(Build.SourcesDirectory)'
123+
snapshotForceEnabled: true

0 commit comments

Comments
 (0)