Merge branch 'hotfix-3.3.13' into support-3.3

Particular · Nov 5, 2014 · 2fe0212 · 2fe0212
2 parents 8692c97 + 917dcec
commit 2fe0212
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 0 deletions.
diff --git a/Octopus/DeploymentProcess.json b/Octopus/DeploymentProcess.json
@@ -0,0 +1,88 @@
+{
+  "Steps": [
+    {
+      "Id": "b3339d4f-563f-49ac-b759-554619554f9d",
+      "Name": "Deploy",
+      "RequiresPackagesToBeAcquired": false,
+      "Properties": {
+        "Octopus.Action.TargetRoles": "tentacle"
+      },
+      "Condition": "Success",
+      "Actions": [
+        {
+          "Id": "f57466ee-18c3-4f89-9aa9-153814528a44",
+          "Name": "Deploy",
+          "ActionType": "Octopus.TentaclePackage",
+          "Environments": [],
+          "Properties": {
+            "Octopus.Action.Package.NuGetFeedId": "feeds-1",
+            "Octopus.Action.EnabledFeatures": "Octopus.Features.ConfigurationTransforms,Octopus.Features.ConfigurationVariables",
+            "Octopus.Action.Package.AutomaticallyRunConfigurationTransformationFiles": "False",
+            "Octopus.Action.Package.AutomaticallyUpdateAppSettingsAndConnectionStrings": "False",
+            "Octopus.Action.Package.DownloadOnTentacle": "False",
+            "Octopus.Action.Package.NuGetPackageId": "%PROJECT_NAME%.Deploy"
+          },
+          "SensitiveProperties": {}
+        }
+      ],
+      "SensitiveProperties": {}
+    },
+    {
+      "Id": "674e1a63-42cf-440e-83be-f80f58ef85a1",
+      "Name": "Notify of draft",
+      "RequiresPackagesToBeAcquired": false,
+      "Properties": {
+        "Octopus.Action.TargetRoles": "tentacle"
+      },
+      "Condition": "Success",
+      "Actions": [
+        {
+          "Id": "578efb8c-8303-4c1f-88a9-f3cee9e14e0a",
+          "Name": "Notify of draft",
+          "ActionType": "Octopus.Script",
+          "Environments": [
+            "Environments-65"
+          ],
+          "Properties": {
+            "Octopus.Action.Script.ScriptBody": "$message = if ($OctopusParameters['HipChatMessage']) { $OctopusParameters['HipChatMessage'] } else { \"(successful) %PROJECT_NAME% [v$($OctopusParameters['Octopus.Release.Number'])] deployed to $($OctopusParameters['Octopus.Environment.Name'])  on $($OctopusParameters['Octopus.Machine.Name'])\" } \n#---------\n$apitoken = $OctopusParameters['HipChatAuthToken']\n$roomid = $OctopusParameters['HipChatRoomId']\n$from = $OctopusParameters['HipChatFrom']\n$colour = $OctopusParameters['HipChatColor']\n\nTry \n{\n\t#Do the HTTP POST to HipChat\n\t$post = \"auth_token=$apitoken&room_id=$roomid&from=$from&color=$colour&message=$message&notify=1&message_format=text\"\n\t$webRequest = [System.Net.WebRequest]::Create(\"https://api.hipchat.com/v1/rooms/message\")\n\t$webRequest.ContentType = \"application/x-www-form-urlencoded\"\n\t$postStr = [System.Text.Encoding]::UTF8.GetBytes($post)\n\t$webrequest.ContentLength = $postStr.Length\n\t$webRequest.Method = \"POST\"\n\t$requestStream = $webRequest.GetRequestStream()\n\t$requestStream.Write($postStr, 0,$postStr.length)\n\t$requestStream.Close()\n\t\n\t[System.Net.WebResponse] $resp = $webRequest.GetResponse();\n\t$rs = $resp.GetResponseStream();\n\t[System.IO.StreamReader] $sr = New-Object System.IO.StreamReader -argumentList $rs;\n\t$sr.ReadToEnd();\t\t\t\t\t\n}\ncatch [Exception] {\n\t\"Woah!, wasn't expecting to get this exception. `r`n $_.Exception.ToString()\"\n}",
+            "Octopus.Action.Template.Id": "ActionTemplates-2",
+            "Octopus.Action.Template.Version": "0",
+            "HipChatFrom": "Octopus Deploy",
+            "HipChatColor": "green",
+            "HipChatRoomId": "#{HipChatEngineeringID}",
+            "HipChatAuthToken": "#{HipChatAPIV1}",
+            "HipChatMessage": "New draft release of %PROJECT_NAME% at https://github.com/Particular/%PROJECT_NAME%/releases"
+          },
+          "SensitiveProperties": {}
+        }
+      ],
+      "SensitiveProperties": {}
+    },
+    {
+      "Id": "b6145394-b751-4d2e-8a92-1b82f1a3fc9a",
+      "Name": "Verify draft",
+      "RequiresPackagesToBeAcquired": false,
+      "Properties": {
+        "Octopus.Action.TargetRoles": ""
+      },
+      "Condition": "Success",
+      "Actions": [
+        {
+          "Id": "737fa883-457b-4821-805a-ade60e58e181",
+          "Name": "Verify draft",
+          "ActionType": "Octopus.Manual",
+          "Environments": [
+            "Environments-65"
+          ],
+          "Properties": {
+            "Octopus.Action.Manual.ResponsibleTeamIds": "teams-everyone",
+            "Octopus.Action.Manual.Instructions": "Please verify the draft release notes of NuGetPackager at https://github.com/Particular/NuGetPackager/releases"
+          },
+          "SensitiveProperties": {}
+        }
+      ],
+      "SensitiveProperties": {}
+    }
+  ],
+  "Version" : "%VERSION%"
+}
diff --git a/Octopus/Project.json b/Octopus/Project.json
@@ -0,0 +1,17 @@
+{
+  "IncludedLibraryVariableSetIds": [
+    "LibraryVariableSets-33",
+    "LibraryVariableSets-36",
+    "LibraryVariableSets-35",
+	"LibraryVariableSets-65"
+  ],
+  "DefaultToSkipIfAlreadyInstalled": false,
+  "VersioningStrategy": {
+    "DonorPackageStepId": null,
+    "Template": "#{Octopus.Version.LastMajor}.#{Octopus.Version.LastMinor}.#{Octopus.Version.NextPatch}"
+  },
+  "Name": "%OCTO_PROJECT_NAME%",
+  "Description": "",
+  "IsDisabled": false,
+  "ProjectGroupId": "ProjectGroups-99",
+}