From 99e2a3485df40ca0673cd3339ae6bc13c18d80fb Mon Sep 17 00:00:00 2001 From: FrankRua Date: Fri, 28 Oct 2022 15:09:59 -0400 Subject: [PATCH 1/4] added format check --- azure-pipelines.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c06ae5c43..1b99a35fe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,6 +21,8 @@ resources: image: packagerepository.sagaws.net:8082/safelite/node-build:15 - container: awscli image: packagerepository.sagaws.net:8082/safelite/awscli-build:3.7 + - container: prettier-node + image: packagerepository.sagaws.net:8082/safelite/prettier-node-build:18 repositories: - repository: AzureDevOps type: github @@ -35,6 +37,15 @@ variables: stages: # PR's - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - stage: TestFormat + displayName: Test Code Format + jobs: + - job: checkFormatting + displayName: Check formatting + container: prettier-node + steps: + - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)" + displayName: Run Prettier check - stage: TestPr displayName: Run Unit Tests For PullRequest jobs: From 617cbfcd2a7074c8e8c7585621c05a9068737980 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Fri, 28 Oct 2022 16:27:39 -0400 Subject: [PATCH 2/4] invalidate check --- azure-pipelines.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1b99a35fe..bedb3f550 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ resources: - container: node image: packagerepository.sagaws.net:8082/safelite/node-build:15 - container: awscli - image: packagerepository.sagaws.net:8082/safelite/awscli-build:3.7 + image: packagerepository.sagaws.net:8082/safelite/awscli2-build:3.9 - container: prettier-node image: packagerepository.sagaws.net:8082/safelite/prettier-node-build:18 repositories: @@ -28,7 +28,7 @@ resources: type: github name: Safelite/AzureDevOps endpoint: Safelite - ref: refs/tags/t5.5.31 + ref: refs/heads/feature/cloudfront-invalidate variables: - group: Digital-Infrastructure @@ -37,15 +37,20 @@ variables: stages: # PR's - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - stage: TestFormat - displayName: Test Code Format + + - stage: test + displayName: CloudFront invalidate jobs: - - job: checkFormatting - displayName: Check formatting - container: prettier-node + - job: cloudfrontInvalidate + displayName: Invalidate CloudFront Cache + container: awscli steps: - - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)" - displayName: Run Prettier check + - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps + parameters: + awsCliContainer: awscli + distributionId: E1Z709RIBQ6PTS + paths: /fmg/* + awsProfile: $(devDeploymentProfile) - stage: TestPr displayName: Run Unit Tests For PullRequest jobs: From 5c1c16ad6960a23104ea493ccdd021f4643f86ca Mon Sep 17 00:00:00 2001 From: FrankRua Date: Mon, 31 Oct 2022 09:10:16 -0400 Subject: [PATCH 3/4] Added cloudfront invalidate / prettier check --- azure-pipelines.yml | 52 ++++++++++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index bedb3f550..ae37319c6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,7 +28,7 @@ resources: type: github name: Safelite/AzureDevOps endpoint: Safelite - ref: refs/heads/feature/cloudfront-invalidate + ref: refs/tags/t5.5.35 variables: - group: Digital-Infrastructure @@ -37,20 +37,16 @@ variables: stages: # PR's - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - - - stage: test - displayName: CloudFront invalidate - jobs: - - job: cloudfrontInvalidate - displayName: Invalidate CloudFront Cache - container: awscli - steps: - - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps - parameters: - awsCliContainer: awscli - distributionId: E1Z709RIBQ6PTS - paths: /fmg/* - awsProfile: $(devDeploymentProfile) + - stage: TestFormat + displayName: Test Code Format + jobs: + - job: checkFormatting + displayName: Check formatting + container: prettier-node + steps: + - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)" + displayName: Run Prettier check + - stage: TestPr displayName: Run Unit Tests For PullRequest jobs: @@ -60,8 +56,6 @@ stages: npmLocation: $(Build.SourcesDirectory) testResultsFile: junit.xml summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml - - - ${{ else }}: # Dev Build/Deploy - stage: Dev @@ -107,7 +101,13 @@ stages: indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) - cfDistributionId: $(cfDistributionId) + cfDistributionId: $(vueCfDistributionId) + - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps + parameters: + awsCliContainer: awscli + distributionId: $(apiCfDistributionId) + paths: /fmg/* + awsProfile: $(devDeploymentProfile) # QA Build/Deploy - stage: Qa @@ -153,7 +153,13 @@ stages: indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) - cfDistributionId: $(cfDistributionId) + cfDistributionId: $(vueCfDistributionId) + - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps + parameters: + awsCliContainer: awscli + distributionId: $(apiCfDistributionId) + paths: /fmg/* + awsProfile: $(qaDeploymentProfile) # Prod Build/Deploy - stage: Prod @@ -199,7 +205,13 @@ stages: indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) __VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__: $(__VUE_APP_GOOGLE_TAG_MANAGER_NOSCRIPT_FRAME_SRC__) - cfDistributionId: $(cfDistributionId) + cfDistributionId: $(apiCfDistributionId) + - template: templates/digital/invalidate-cloudfront-cache.yml@AzureDevOps + parameters: + awsCliContainer: awscli + distributionId: $(apiCfDistributionId) + paths: /fmg/* + awsProfile: $(prodDeploymentProfile) - template: templates/digital/auto-tag.yml@AzureDevOps parameters: dependsOn: prodBuildDeployment From 80db3582b4a90f1f3cd5f9fe118166f9fae738a5 Mon Sep 17 00:00:00 2001 From: FrankRua Date: Mon, 31 Oct 2022 09:13:02 -0400 Subject: [PATCH 4/4] Fixed index --- azure-pipelines.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ae37319c6..1b61fa51c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,24 +38,24 @@ stages: # PR's - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - stage: TestFormat - displayName: Test Code Format - jobs: - - job: checkFormatting - displayName: Check formatting - container: prettier-node - steps: - - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)" - displayName: Run Prettier check + displayName: Test Code Format + jobs: + - job: checkFormatting + displayName: Check formatting + container: prettier-node + steps: + - bash: prettier --check "$(Build.SourcesDirectory)/src/**/*.(js|vue)" + displayName: Run Prettier check - - stage: TestPr - displayName: Run Unit Tests For PullRequest - jobs: - - template: templates/digital/vue-jest-run-unit-tests.yml@AzureDevOps - parameters: - nodeContainer: node - npmLocation: $(Build.SourcesDirectory) - testResultsFile: junit.xml - summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml + - stage: TestPr + displayName: Run Unit Tests For PullRequest + jobs: + - template: templates/digital/vue-jest-run-unit-tests.yml@AzureDevOps + parameters: + nodeContainer: node + npmLocation: $(Build.SourcesDirectory) + testResultsFile: junit.xml + summaryFileLocation: $(Build.SourcesDirectory)/coverage/cobertura-coverage.xml - ${{ else }}: # Dev Build/Deploy - stage: Dev