@@ -24,16 +24,19 @@ jobs:
2424 - job : Platform
2525 dependsOn : Controller
2626 pool : server
27+ variables :
28+ tagPrefix : $[ dependencies.Controller.outputs['setcontrollertarvarStep.type'] ]
2729
2830 steps :
31+
2932 - task : InvokeRESTAPI@1
3033 displayName : ' trigger platform job'
3134 inputs :
3235 connectionType : ' connectedServiceName'
3336 serviceConnection : ' Pipelines'
3437 method : ' POST'
3538 urlSuffix : ' /edgeworx/_apis/build/builds?api-version=5.0'
36- body : " {\" Parameters\" :\" {\\\" images.controller\\\" : \\\" gcr.io/$(repository):dev -$(commit)\\\" }\" , \" Definition\" :{\" id\" :\" 5\" }}"
39+ body : " {\" Parameters\" :\" {\\\" images.controller\\\" : \\\" gcr.io/$(repository):$(tagPrefix) -$(commit)\\\" }\" , \" Definition\" :{\" id\" :\" 5\" }}"
3740 waitForCompletion : ' false'
3841
3942 - job : Controller
@@ -75,36 +78,38 @@ jobs:
7578 tar=$(ls iofogcontroller-*.tgz)
7679 echo $tar
7780 echo "##vso[task.setvariable variable=controller_tar]$tar"
78- if($(type)== 'release'); then
79- echo "##vso[task.setvariable variable=type]rc"
81+ if [ $(type) = 'develop' ]; then
82+ echo "##vso[task.setvariable variable=type]dev"
83+ echo "##vso[task.setvariable variable=type;isOutput=true]dev"
84+ elif [ $(type) = 'release' ]; then
85+ echo "##vso[task.setvariable variable=type]rel"
86+ echo "##vso[task.setvariable variable=type;isOutput=true]rel"
8087 fi
8188 displayName: 'setting vars'
8289 name: setcontrollertarvarStep
83-
90+
8491 - task : Docker@2
85- displayName : ' build dev docker'
92+ displayName : ' build docker'
8693 inputs :
8794 containerRegistry : ' Edgeworx GCP'
8895 repository : $(repository)
8996 command : ' build'
90- Dockerfile : ' Dockerfile.dev '
97+ Dockerfile : " Dockerfile.$(type) "
9198 arguments : --build-arg FILENAME=$(controller_tar)
9299 tags : |
93- dev-$(commit)
94- dev-$(type)
95- dev-latest
100+ $(type)-$(commit)
101+ $(type)-latest
96102
97103 - task : Docker@2
98- displayName : ' push dev docker'
104+ displayName : ' push docker'
99105 inputs :
100106 containerRegistry : ' Edgeworx GCP'
101107 repository : $(repository)
102108 command : ' push'
103- Dockerfile : ' Dockerfile.dev '
109+ Dockerfile : " Dockerfile.$(type) "
104110 tags : |
105- dev-$(commit)
106- dev-$(type)
107- dev-latest
111+ $(type)-$(commit)
112+ $(type)-latest
108113
109114 - script : |
110115 echo "npm test"
0 commit comments