Merge branch 'main' into ellen/user-invites-new-role

Author: ellen-octopus

.octopus/deployment_process.ocl

@@ -65,7 +65,7 @@ step "slack-notify-feed-website-automation" {
     action {
         properties = {
             Channel = "#feed-website-automation"
-            DeploymentInfoText = "#{Octopus.Project.Name} release #{Octopus.Release.Number} to #{Octopus.Environment.Name} #{AWS.Website}"
+            DeploymentInfoText = "#{Octopus.Project.Name} release #{Octopus.Release.Number} to <#{AWS.Website}|#{Octopus.Environment.Name} ↗️>"
             HookUrl = "#{FeedWebsiteAutomation.WebHook}"
             IconUrl = "https://octopus.com/content/resources/favicon.png"
             IncludeErrorMessageOnFailure = "false"

package.json

@@ -23,12 +23,12 @@
         "watch": "onchange 'src/**/*.{js,mjs,ts,astro,css}' 'public/docs/js/**/*.js' 'public/docs/css/**/*.css' -- prettier --write --plugin=prettier-plugin-astro {{changed}}"
     },
     "dependencies": {
-        "@astrojs/mdx": "^4.2.3",
-        "@pnpm/exe": "^10.8.0",
-        "astro": "^5.6.1",
-        "astro-accelerator-utils": "^0.3.40",
-        "cspell": "^8.18.1",
-        "glob": "^11.0.1",
+        "@astrojs/mdx": "^4.3.0",
+        "@pnpm/exe": "^10.11.1",
+        "astro": "^5.9.0",
+        "astro-accelerator-utils": "^0.3.43",
+        "cspell": "^8.19.4",
+        "glob": "^11.0.2",
         "gray-matter": "^4.0.3",
         "hast-util-from-selector": "^3.0.1",
         "html-to-text": "^9.0.5",
@@ -39,7 +39,7 @@
         "sharp": "^0.33.5"
     },
     "devDependencies": {
-        "@playwright/test": "^1.51.1",
+        "@playwright/test": "^1.52.0",
         "csv-parse": "^5.6.0",
         "npm-run-all": "^4.1.5",
         "onchange": "^7.1.0",

pnpm-lock.yaml

@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Default.astro
 pubDate: 2023-01-01
-modDate: 2023-01-01
+modDate: 2025-06-10
 title: Managing server configuration
 description: The Octopus Server configuration can be managed programmatically through the Octopus.Client library and the API
 navOrder: 1801
@@ -22,19 +22,8 @@ In the Octopus Web Portal, you can access configuration by navigating to **Confi
 
 Using [Octopus.Client](/docs/octopus-rest-api/octopus.client), each of the configuration types can be managed programmatically, reading from and writing back to the Octopus Deploy database.
 
-The class definitions for each of the configurations is available by referencing the relevant `Octopus.Client.Extensibility.*` library, which are available via NuGet:
-
-- [Octopus.Client.Extensibility.Authentication.Guest](https://www.nuget.org/packages/Octopus.Client.Extensibility.Authentication.Guest/)
-- [Octopus.Client.Extensibility.Authentication.DirectoryServices](https://www.nuget.org/packages/Octopus.Client.Extensibility.Authentication.DirectoryServices/)
-- [Octopus.Client.Extensibility.Authentication.UsernamePassword](https://www.nuget.org/packages/Octopus.Client.Extensibility.Authentication.UsernamePassword/)
-- [Octopus.Client.Extensibility.Authentication.AzureAD](https://www.nuget.org/packages/Octopus.Client.Extensibility.Authentication.AzureAD/)
-- [Octopus.Client.Extensibility.Authentication.GoogleApps](https://www.nuget.org/packages/Octopus.Client.Extensibility.Authentication.GoogleApps/)
-- [Octopus.Client.Extensibility.Authentication.Okta](https://www.nuget.org/packages/Octopus.Client.Extensibility.Authentication.Okta/)
-
-Web Portal and Authentication types are available in [Octopus.Client](https://www.nuget.org/packages/Octopus.Client/)
-
 :::div{.hint}
-This requires version 4.27.0 or later of the client library.
+This requires version 15.2.0 or later of the client library.
 :::
 
 ### .Net / C#
@@ -58,22 +47,21 @@ var server = "http://myoctopusserver/";
 var apiKey = "API-XXXXXXXX";             // Get this from your 'profile' page in the Octopus Web Portal
 var endpoint = new OctopusServerEndpoint(server, apiKey);
 var repository = new OctopusRepository(endpoint);
-var webportalConfig = repository.Configuration.Get<WebPortalConfigResource>();
-webportalConfig.Security.HttpStrictTransportSecurityEnabled = true;
-webportalConfig = repository.Configuration.Modify(webportalConfig);
+var webPortalConfig = repository.Configuration.Get<WebPortalConfigResource>();
+webPortalConfig.Security.HttpStrictTransportSecurityEnabled = true;
+webPortalConfig = repository.Configuration.Modify(webPortalConfig);
 ```
 
 ### PowerShell
 
 ```powershell
 add-type -path 'C:\PathTo\Octopus.Client.dll'
-add-type -path 'C:\PathTo\Octopus.Client.Extensibility.Authentication.Guest.dll'
 $server = 'http://myoctopusserver/'
 $apikey = 'API-XXXXXXXX';
 $endpoint = New-Object Octopus.Client.OctopusServerEndpoint $server,$apikey
 $repo = New-Object Octopus.Client.OctopusRepository $endpoint
-$getMethod = $repo.Configuration.GetType().GetMethod("Get").MakeGenericMethod([Octopus.Client.Extensibility.Authentication.Guest.Configuration.GuestConfigurationResource])
-$modifyMethod = $repo.Configuration.GetType().GetMethod("Modify").MakeGenericMethod([Octopus.Client.Extensibility.Authentication.Guest.Configuration.GuestConfigurationResource])
+$getMethod = $repo.Configuration.GetType().GetMethod("Get").MakeGenericMethod([Octopus.Client.Model.Authentication.Guest.GuestConfigurationResource])
+$modifyMethod = $repo.Configuration.GetType().GetMethod("Modify").MakeGenericMethod([Octopus.Client.Model.Authentication.Guest.GuestConfigurationResource])
 $guestConfig = $getMethod.Invoke($repo.Configuration, $null)
 $guestConfig.IsEnabled = $true;
 $guestConfig = $modifyMethod.Invoke($repo.Configuration, $guestConfig)

public/docs/octopus-cloud/images/create-private-endpoint-basics.png

@@ -1,7 +1,7 @@
 ---
 layout: src/layouts/Default.astro
 pubDate: 2023-01-01
-modDate: 2025-04-28
+modDate: 2025-06-03
 title: Retention policies
 icon: fa-solid fa-broom
 description: Retention policies allow you to specify the releases, packages and files you want to keep as well as the ones you want cleaned up.
@@ -55,7 +55,7 @@ The disk space calculation for both targets and workers looks at the entire disk
 
 ### Built-in repository \{#built-in-repo-whats-deleted}
 
-A retention policy can be applied to packages in the built-in Octopus package repository. By default, the policy is set to keep all packages indefinitely. This policy is *separate* from the [release retention policy](#releases-whats-deleted) described above.
+A retention policy can be applied to packages in the [built-in Octopus package repository](/docs/packaging-applications/package-repositories/built-in-repository). By default, the policy is set to keep all packages indefinitely. This policy is *separate* from the [release retention policy](#releases-whats-deleted) described above.
 
 :::figure
 ![](/docs/administration/retention-policies/images/built-in-repository.png)
@@ -70,6 +70,22 @@ When a package retention policy is applied, Octopus will delete packages that me
 When configuring the repository retention policy, it's also worth making note of your [release retention policy](#releases-whats-deleted) settings too. When releases are deleted as a result of your release retention policy, then packages associated with those releases may become subject to cleanup by your repository policy.
 :::
 
+:::div{.info}
+From Octopus Cloud version 2025.3.672, packages associated with releases in the Octopus Built-in repository can be deleted. This feature is behind a feature toggle, please contact michelle.obrien@octopus.com if you would like to turn this feature on.
+:::
+
+From the Built-in Repository Retention configuration page:
+
+- Select **A limited time** and configure the number of days to retain packages.
+- Select **Always keep packages used by releases and runbook runs on the dashboard**
+
+This option ensures that packages associated with releases and runbook runs are deleted from the Built-in Repository. Any packages associated with releases displayed on either the main dashboard or a [project dashboard](/docs/projects/project-dashboard) are **never deleted**. Any packages associated with runbooks displayed on the projects runbook dashboard are also **never deleted**.
+
+When this option is selected and a package retention policy is applied, Octopus will delete packages that meet *both* of the following criteria:
+
+1. The time span from the package's initial publish date exceeds the configured time period in the policy
+2. The package is **not associated with a release or runbook run displayed on the dashboard**
+
 ### Build information \{#build-information-whats-deleted}
 
 [Build information](/docs/packaging-applications/build-servers/build-information) stored in Octopus is associated with **packages**. Octopus will decide how long to keep the build information based on the package they are linked to:

public/docs/octopus-cloud/images/create-private-endpoint-resource.png

@@ -169,6 +169,8 @@ If you add a variable to your project named `Octopus.JiraServiceManagement.Chang
 then an Issue will not be created, and instead, the supplied number will be used during the 
 approval check. This variable can also be [scoped](/docs/projects/variables/getting-started/#scoping-variables) or configured as a [Prompted variable](/docs/projects/variables/prompted-variables).
 
+From **2025.2** on this can be set under the `Jira Service Management Issue settings` section on the deployment or runbook run creation page. Setting the Issue number at the deployment or runbook run level will override any predefined variable.
+
 ### Setting up environments for CR approval
 
 To enable an environment to enforce a requirement for an approved CR, navigate to **{