From 02f3e8b1e8b7f6be604e30856d8d7d608a4ee591 Mon Sep 17 00:00:00 2001 From: My Ho Date: Fri, 6 Mar 2020 15:18:08 -0800 Subject: [PATCH 1/4] Upgrade windows & mac agents per AzDO removing older support --- azure-pipelines.yml | 4 ++-- preview-release-pipeline.yml | 6 +++--- release-pipeline.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7445e67d38..9b6919c361 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,7 +17,7 @@ jobs: - job: MacOS pool: - vmImage: macOS-10.13 + vmImage: macOS-10.15 timeoutInMinutes: 60 # how long to run the job before automatically cancelling steps: - checkout: self # self represents the repo where the initial Pipelines YAML file was found @@ -26,7 +26,7 @@ jobs: - job: Windows pool: - vmImage: win1803 + vmImage: "windows-2019" timeoutInMinutes: 60 # how long to run the job before automatically cancelling steps: - checkout: self # self represents the repo where the initial Pipelines YAML file was found diff --git a/preview-release-pipeline.yml b/preview-release-pipeline.yml index 31833ecce7..02194c70b4 100644 --- a/preview-release-pipeline.yml +++ b/preview-release-pipeline.yml @@ -13,7 +13,7 @@ stages: cancelTimeoutInMinutes: 1 # time limit to wait for job to cancel pool: - vmImage: macOS-10.13 # ssh key was generated on a Mac so using the same type of OS here + vmImage: macOS-10.15 # ssh key was generated on a Mac so using the same type of OS here steps: - task: NodeTool@0 @@ -63,7 +63,7 @@ stages: parameters: name: Windows pool: - vmImage: vs2017-win2016 + vmImage: "windows-2019" os: windows artifact: vott*.exe @@ -71,7 +71,7 @@ stages: parameters: name: MacOS pool: - vmImage: macOS-10.13 + vmImage: macOS-10.15 os: mac artifact: vott*.dmg diff --git a/release-pipeline.yml b/release-pipeline.yml index b76333e056..f030c0a102 100644 --- a/release-pipeline.yml +++ b/release-pipeline.yml @@ -16,7 +16,7 @@ jobs: - job: MacOS condition: succeeded() pool: - vmImage: macOS-10.13 + vmImage: macOS-10.15 timeoutInMinutes: 60 # how long to run the job before automatically cancelling steps: - checkout: self # self represents the repo where the initial Pipelines YAML file was found @@ -26,7 +26,7 @@ jobs: - job: Windows condition: succeeded() pool: - vmImage: vs2017-win2016 + vmImage: "windows-2019" timeoutInMinutes: 60 # how long to run the job before automatically cancelling steps: - checkout: self # self represents the repo where the initial Pipelines YAML file was found From 008ed837212040b6d513df14a8f145d7ff916c46 Mon Sep 17 00:00:00 2001 From: My Ho Date: Fri, 6 Mar 2020 15:53:00 -0800 Subject: [PATCH 2/4] fix service connection issues --- .../plato/generate-up-to-date-report.yml | 2 +- server/azure-deploy.yml | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/azure-pipelines/plato/generate-up-to-date-report.yml b/azure-pipelines/plato/generate-up-to-date-report.yml index 0fcc3bd3e8..1c8f461021 100644 --- a/azure-pipelines/plato/generate-up-to-date-report.yml +++ b/azure-pipelines/plato/generate-up-to-date-report.yml @@ -51,7 +51,7 @@ steps: - task: AzureCLI@1 displayName: "Pull down old report and add updates" inputs: - azureSubscription: 'PELITTLE TEAM - CSE DWR (d36d0808-a967-4f73-9fdc-32ea232fc81d)' + azureSubscription: 'pj-little-sub' scriptLocation: inlineScript inlineScript: './scripts/update-report.sh' diff --git a/server/azure-deploy.yml b/server/azure-deploy.yml index d70e46f1ef..b0d1f55fdf 100644 --- a/server/azure-deploy.yml +++ b/server/azure-deploy.yml @@ -8,8 +8,8 @@ trigger: variables: # Azure Resource Manager connection created during pipeline creation - azureSubscription: 'fe7b93fe-e836-4a55-804c-883dbea6af24' - + azureSubscription: 'pj-little-sub' + # Web app name webAppName: 'vott' @@ -19,25 +19,25 @@ variables: stages: - stage: Build displayName: Build stage - jobs: + jobs: - job: Build displayName: Build pool: vmImage: $(vmImageName) - + steps: - task: NodeTool@0 inputs: versionSpec: '10.x' displayName: 'Install Node.js' - - script: | + - script: | npm install npm run build --if-present # npm run test --if-present workingDirectory: $(System.DefaultWorkingDirectory)/server displayName: 'npm install, build and test' - + - task: ArchiveFiles@2 displayName: 'Archive files' inputs: @@ -58,12 +58,12 @@ stages: - deployment: Deploy displayName: Deploy environment: 'development' - pool: + pool: vmImage: $(vmImageName) strategy: runOnce: deploy: - steps: + steps: - task: AzureWebApp@1 displayName: 'Azure Web App Deploy: vott' inputs: @@ -72,4 +72,4 @@ stages: appName: $(webAppName) runtimeStack: 'NODE|10.10' package: $(Pipeline.Workspace)/drop/$(Build.BuildId).zip - startUpCommand: 'npm run start' \ No newline at end of file + startUpCommand: 'npm run start' From 36fa6908bdb0365867d09132914b13bfe2cd987b Mon Sep 17 00:00:00 2001 From: My Ho Date: Wed, 25 Mar 2020 10:50:23 -0700 Subject: [PATCH 3/4] disable server deploy --- server/azure-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/azure-deploy.yml b/server/azure-deploy.yml index b0d1f55fdf..940eee02c3 100644 --- a/server/azure-deploy.yml +++ b/server/azure-deploy.yml @@ -3,8 +3,8 @@ # Add steps that analyze code, save build artifacts, deploy, and more: # https://docs.microsoft.com/azure/devops/pipelines/languages/javascript -trigger: -- johnshew/login +trigger: none +pr: none variables: # Azure Resource Manager connection created during pipeline creation From c84e88a9a20230ab2323e7371949b32013876cf9 Mon Sep 17 00:00:00 2001 From: My Ho Date: Wed, 25 Mar 2020 11:02:14 -0700 Subject: [PATCH 4/4] undo sub change in server pipeline --- server/azure-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/azure-deploy.yml b/server/azure-deploy.yml index 940eee02c3..1ffe053651 100644 --- a/server/azure-deploy.yml +++ b/server/azure-deploy.yml @@ -8,7 +8,7 @@ pr: none variables: # Azure Resource Manager connection created during pipeline creation - azureSubscription: 'pj-little-sub' + azureSubscription: fe7b93fe-e836-4a55-804c-883dbea6af24' # Web app name webAppName: 'vott'