Skip to content

Commit

Permalink
Remove Windows 2019 worker pool use (#257)
Browse files Browse the repository at this point in the history
  • Loading branch information
APErebus authored Dec 19, 2023
1 parent c3588c5 commit b601c42
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
32 changes: 16 additions & 16 deletions .octopus/deployment_process.ocl
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ step "upload-octopustools-to-s3-public-with-hashes" {
PackageToUpload = "{\"PackageId\":\"OctopusTools.Zips\",\"FeedId\":\"octopus-server-built-in\"}"
S3BucketPath = "#{AwsBucket}/octopus-tools/#{Octopus.Action.Package[PackageToUpload].PackageVersion}/"
}
worker_pool = "hosted-windows-2019"
worker_pool = "hosted-windows"

packages "PackageToUpload" {
acquisition_location = "Server"
Expand Down Expand Up @@ -37,11 +37,11 @@ step "push-octopus-dotnet-cli-to-nuget-style-feed" {

# nuget push
. $nugetExe push "$($OctopusParameters["Octopus.Action.Package[Octopus.DotNet.Cli].PackageFilePath"])" -source $FeedUrl -apikey $FeedApiKey
EOT
EOT
Octopus.Action.Script.ScriptSource = "Inline"
Octopus.Action.Script.Syntax = "PowerShell"
}
worker_pool = "hosted-windows-2019"
worker_pool = "hosted-windows"

packages "NuGet.CommandLine" {
acquisition_location = "Server"
Expand Down Expand Up @@ -89,11 +89,11 @@ step "push-octopustools-to-nuget-style-feed" {
}
}
exit 1
EOT
EOT
Octopus.Action.Script.ScriptSource = "Inline"
Octopus.Action.Script.Syntax = "PowerShell"
}
worker_pool = "hosted-windows-2019"
worker_pool = "hosted-windows"

packages "NuGet.CommandLine" {
acquisition_location = "Server"
Expand Down Expand Up @@ -143,11 +143,11 @@ step "push-octopustools-to-chocolatey" {
}
}
exit 1
EOT
EOT
Octopus.Action.Script.ScriptSource = "Inline"
Octopus.Action.Script.Syntax = "PowerShell"
}
worker_pool = "hosted-windows-2019"
worker_pool = "hosted-windows"

packages "OctopusTools" {
acquisition_location = "Server"
Expand Down Expand Up @@ -212,7 +212,7 @@ step "push-changes-to-homebrew-repo" {
&& git push --repo $repoUrl --set-upstream origin $branchName \
)

EOT
EOT
Octopus.Action.Script.ScriptSource = "Inline"
Octopus.Action.Script.Syntax = "Bash"
OctopusUseBundledTooling = "False"
Expand Down Expand Up @@ -254,7 +254,7 @@ step "publish-homebrew" {
PubHomebrew-RepoName = "homebrew-taps"
PubHomebrew-Username = "#{HomeBrewGitUsername}"
}
worker_pool = "hosted-windows-2019"
worker_pool = "hosted-windows"

packages "PackageToUpload" {
acquisition_location = "Server"
Expand Down Expand Up @@ -289,7 +289,7 @@ step "publish-to-apt-repo" {
--env AWS_SECRET_ACCESS_KEY="$(get_octopusvariable "LinuxPackagePublisherAwsAccount.SecretKey")" \
octopusdeploy/publish-linux bash -c 'cd /working && bash publish-apt.sh' 2>&1 || exit

EOT
EOT
Octopus.Action.Script.ScriptSource = "Inline"
Octopus.Action.Script.Syntax = "Bash"
}
Expand Down Expand Up @@ -327,7 +327,7 @@ step "publish-to-rpm-repo" {
--env AWS_SECRET_ACCESS_KEY="$(get_octopusvariable "LinuxPackagePublisherAwsAccount.SecretKey")" \
octopusdeploy/publish-linux bash -c 'cd /working && bash publish-rpm.sh' 2>&1 || exit

EOT
EOT
Octopus.Action.Script.ScriptSource = "Inline"
Octopus.Action.Script.Syntax = "Bash"
}
Expand Down Expand Up @@ -438,7 +438,7 @@ step "push-docker-images-to-prod" {

Run

EOT
EOT
Octopus.Action.Script.ScriptSource = "Inline"
Octopus.Action.Script.Syntax = "PowerShell"
}
Expand Down Expand Up @@ -509,11 +509,11 @@ step "create-release-in-slipway" {
ReleaseToWeb "OctopusCli" $version $releaseNotes


EOT
EOT
Octopus.Action.Script.ScriptSource = "Inline"
Octopus.Action.Script.Syntax = "PowerShell"
}
worker_pool = "hosted-windows-2019"
worker_pool = "hosted-windows"

packages "OctopusTools" {
acquisition_location = "NotAcquired"
Expand All @@ -537,7 +537,7 @@ step "invalidate-cloudfront-cache" {
Octopus.Action.Template.Id = "ActionTemplates-962"
Octopus.Action.Template.Version = "1"
}
worker_pool = "hosted-windows-2019"
worker_pool = "hosted-windows"
}
}

Expand All @@ -553,6 +553,6 @@ step "invalidate-cloudflare-cache-of-the-octopustools-manifest" {
Octopus.Action.Template.Id = "ActionTemplates-963"
Octopus.Action.Template.Version = "6"
}
worker_pool = "hosted-windows-2019"
worker_pool = "hosted-windows"
}
}
2 changes: 1 addition & 1 deletion .octopus/deployment_settings.ocl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ deployment_changes_template = <<-EOT
#{each release in Octopus.Deployment.Changes}
#{release.ReleaseNotes}
#{/each}
EOT
EOT

connectivity_policy {
}
Expand Down
2 changes: 1 addition & 1 deletion .octopus/schema_version.ocl
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = 5
version = 6

0 comments on commit b601c42

Please sign in to comment.