Skip to content
This repository has been archived by the owner on Apr 13, 2020. It is now read-only.

Refactor fab set to set image tag in service directory config file #378

Merged
merged 9 commits into from
Mar 10, 2020
Merged

Refactor fab set to set image tag in service directory config file #378

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab7816e
Refactor fab set to set image tag in service directory config file
yradsmikham Mar 7, 2020
f3a3e06
resolved unit tests
yradsmikham Mar 9, 2020
da77eda
generate config in ring directory
yradsmikham Mar 9, 2020
75645a3
update branch name regex
yradsmikham Mar 9, 2020
552725e
Merge branch 'master' into master
yradsmikham Mar 9, 2020
530bed3
Merge branch 'master' into master
yradsmikham Mar 9, 2020
4fd6f3e
Merge branch 'master' into master
yradsmikham Mar 9, 2020
fde0236
Merge branch 'master' into master
bnookala Mar 10, 2020
531b8d0
Merge branch 'master' into master
yradsmikham Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/lib/fileutils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ export const generateAccessYaml = (

/**
* Outputs a bash string for a _safe_ source branch string -- a string where all
* '/' and '.' in the string have been replaced with a '-'`
* '/', '.', and '_' in the string have been replaced with a '-'`
*/

export const SAFE_SOURCE_BRANCH = `$(echo $(Build.SourceBranchName) | tr / - | tr . -)`;
export const SAFE_SOURCE_BRANCH = `$(echo $(Build.SourceBranchName) | tr / - | tr . - | tr _ - )`;

/**
* Outputs a bash script to generate a _safe_ azure container registry url where it's all lowercase.
Expand Down Expand Up @@ -298,7 +298,9 @@ export const serviceBuildAndUpdatePipeline = (
`echo "Image Name: $IMAGE_NAME"`,
`export IMAGE_REPO=${IMAGE_REPO}`,
`echo "Image Repository: $IMAGE_REPO"`,
`../fab/fab set --subcomponent $(Build.Repository.Name).$FAB_SAFE_SERVICE_NAME.${SAFE_SOURCE_BRANCH}.chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
`cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME/${SAFE_SOURCE_BRANCH}`,
`echo "FAB SET"`,
`fab set --subcomponent chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
`echo "GIT STATUS"`,
`git status`,
`echo "GIT ADD (git add -A)"`,
Expand Down
4 changes: 3 additions & 1 deletion src/test/mockFactory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ export const createTestServiceBuildAndUpdatePipelineYaml = (
`echo "Image Name: $IMAGE_NAME"`,
`export IMAGE_REPO=${IMAGE_REPO}`,
`echo "Image Repository: $IMAGE_REPO"`,
`../fab/fab set --subcomponent $(Build.Repository.Name).$FAB_SAFE_SERVICE_NAME.${SAFE_SOURCE_BRANCH}.chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
`cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME/${SAFE_SOURCE_BRANCH}`,
`echo "FAB SET"`,
`fab set --subcomponent chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME`,
`echo "GIT STATUS"`,
`git status`,
`echo "GIT ADD (git add -A)"`,
Expand Down