This repository was archived by the owner on Apr 13, 2020. It is now read-only.
File tree 2 files changed +8
-4
lines changed
2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -73,10 +73,10 @@ export const generateAccessYaml = (
73
73
74
74
/**
75
75
* Outputs a bash string for a _safe_ source branch string -- a string where all
76
- * '/' and '. ' in the string have been replaced with a '-'`
76
+ * '/', '.', and '_ ' in the string have been replaced with a '-'`
77
77
*/
78
78
79
- export const SAFE_SOURCE_BRANCH = `$(echo $(Build.SourceBranchName) | tr / - | tr . -)` ;
79
+ export const SAFE_SOURCE_BRANCH = `$(echo $(Build.SourceBranchName) | tr / - | tr . - | tr _ - )` ;
80
80
81
81
/**
82
82
* Outputs a bash script to generate a _safe_ azure container registry url where it's all lowercase.
@@ -298,7 +298,9 @@ export const serviceBuildAndUpdatePipeline = (
298
298
`echo "Image Name: $IMAGE_NAME"` ,
299
299
`export IMAGE_REPO=${ IMAGE_REPO } ` ,
300
300
`echo "Image Repository: $IMAGE_REPO"` ,
301
- `../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` ,
301
+ `cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME/${ SAFE_SOURCE_BRANCH } ` ,
302
+ `echo "FAB SET"` ,
303
+ `fab set --subcomponent chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME` ,
302
304
`echo "GIT STATUS"` ,
303
305
`git status` ,
304
306
`echo "GIT ADD (git add -A)"` ,
Original file line number Diff line number Diff line change @@ -139,7 +139,9 @@ export const createTestServiceBuildAndUpdatePipelineYaml = (
139
139
`echo "Image Name: $IMAGE_NAME"` ,
140
140
`export IMAGE_REPO=${ IMAGE_REPO } ` ,
141
141
`echo "Image Repository: $IMAGE_REPO"` ,
142
- `../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` ,
142
+ `cd $(Build.Repository.Name)/$FAB_SAFE_SERVICE_NAME/${ SAFE_SOURCE_BRANCH } ` ,
143
+ `echo "FAB SET"` ,
144
+ `fab set --subcomponent chart image.tag=$IMAGE_TAG image.repository=$IMAGE_REPO/$BUILD_REPO_NAME` ,
143
145
`echo "GIT STATUS"` ,
144
146
`git status` ,
145
147
`echo "GIT ADD (git add -A)"` ,
You can’t perform that action at this time.
0 commit comments