Update CI for v5.0 release (#2124)

* Move azure templates to dedicated directory + add aws templates to the release * Remove portal name from default coniguration * Fix azure path in pipeline
CGI-FR · Jun 18, 2023 · 74041f6 · 74041f6
1 parent 876a9fc
commit 74041f6
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -69,7 +69,7 @@ jobs:
             ${{ steps.meta.outputs.tags }}
 
   arm_templates:
-    name: Publish ARM templates
+    name: Publish cloud infrastructure templates
     # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
@@ -112,24 +112,34 @@ jobs:
         working-directory: arm-templates
         run: |
             rm -rf ./templates/
-            mkdir -p templates/iotedge-lorawan-starterkit
+            mkdir -p templates/azure/iotedge-lorawan-starterkit
             touch ./templates/.gitkeep
             cp -r ../IoT-Hub-Portal/templates/* ./templates/
-            cp -r ../iotedge-lorawan-starterkit/TemplateBicep/* ./templates/iotedge-lorawan-starterkit/
-            sed -r -i 's/..\/iotedge-lorawan-starterkit\/TemplateBicep\/main.bicep/.\/iotedge-lorawan-starterkit\/main.bicep/g' ./templates/portal_with_lorawan_and_starter_kit.bicep
+            cp -r ../iotedge-lorawan-starterkit/TemplateBicep/* ./templates/azure/iotedge-lorawan-starterkit/
+            sed -r -i 's/..\/iotedge-lorawan-starterkit\/TemplateBicep\/main.bicep/.\/iotedge-lorawan-starterkit\/main.bicep/g' ./templates/azure/portal_with_lorawan_and_starter_kit.bicep
       
       - name: Update IoTHub Portal docker image tag in app_service.bicep
-        working-directory: arm-templates/templates
+        working-directory: arm-templates/templates/azure
         run: sed -i 's/ghcr.io\/cgi-fr\/iothub-portal:latest/ghcr.io\/cgi-fr\/iothub-portal:${{ fromJSON(steps.version.outputs.json).labels['org.opencontainers.image.version'] }}/g' app_service.bicep
 
+      - name: Update IoTHub Portal docker image tag in awsdeploy.yml
+        working-directory: arm-templates/templates/aws
+        run: sed -i 's/\${AWS::AccountId}.dkr.ecr.\${AWS::Region}.amazonaws.com\/iot-hub-portal:latest/578920151383.dkr.ecr.eu-west-1.amazonaws.com\/iot-hub-portal:${{ fromJSON(steps.version.outputs.json).labels['org.opencontainers.image.version'] }}/g' awsdeploy.yml
+
       - name: Generate ARM file
-        working-directory: arm-templates/templates
+        working-directory: arm-templates/templates/azure
         run: az bicep build --file azuredeploy.bicep --outfile azuredeploy.json 
 
-      - name: Upload templates to release assets
+      - name: Upload azure templates to release assets
+        uses: AButler/upload-release-assets@v2.0
+        with:
+          files: 'arm-templates/templates/azure/*.json'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Upload aws templates to release assets
         uses: AButler/upload-release-assets@v2.0
         with:
-          files: 'arm-templates/templates/*.json'
+          files: 'arm-templates/templates/aws/*.yml'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create PR for template updates

diff --git a/templates/aws/awsdeploy.yml b/templates/aws/awsdeploy.yml
@@ -629,8 +629,6 @@ Resources:
                   Fn::Sub: "${openIdScopeName}"
               - Name: CloudProvider
                 Value: AWS
-              - Name: PortalName
-                Value: IoT Portal DEMO - AWS
           ImageIdentifier:
             Fn::Sub: "${AWS::AccountId}.dkr.ecr.${AWS::Region}.amazonaws.com/iot-hub-portal:latest"
           ImageRepositoryType: ECR

diff --git a/templates/app_insights.bicep → templates/azure/app_insights.bicep b/templates/app_insights.bicep → templates/azure/app_insights.bicep
diff --git a/templates/app_service.bicep → templates/azure/app_service.bicep b/templates/app_service.bicep → templates/azure/app_service.bicep
diff --git a/templates/app_service_plan.bicep → templates/azure/app_service_plan.bicep b/templates/app_service_plan.bicep → templates/azure/app_service_plan.bicep
diff --git a/templates/azuredeploy.bicep → templates/azure/azuredeploy.bicep b/templates/azuredeploy.bicep → templates/azure/azuredeploy.bicep
diff --git a/templates/azuredeploy.json → templates/azure/azuredeploy.json b/templates/azuredeploy.json → templates/azure/azuredeploy.json
diff --git a/templates/azuredeployUI.json → templates/azure/azuredeployUI.json b/templates/azuredeployUI.json → templates/azure/azuredeployUI.json
diff --git a/templates/blob_container.bicep → templates/azure/blob_container.bicep b/templates/blob_container.bicep → templates/azure/blob_container.bicep
diff --git a/templates/database.bicep → templates/azure/database.bicep b/templates/database.bicep → templates/azure/database.bicep
diff --git a/templates/dps.bicep → templates/azure/dps.bicep b/templates/dps.bicep → templates/azure/dps.bicep
diff --git a/templates/iothub.bicep → templates/azure/iothub.bicep b/templates/iothub.bicep → templates/azure/iothub.bicep
diff --git a/...ates/iothub_eventhub_consumer_group.bicep → ...zure/iothub_eventhub_consumer_group.bicep b/...ates/iothub_eventhub_consumer_group.bicep → ...zure/iothub_eventhub_consumer_group.bicep
diff --git a/templates/portal_with_lorawan.bicep → templates/azure/portal_with_lorawan.bicep b/templates/portal_with_lorawan.bicep → templates/azure/portal_with_lorawan.bicep
diff --git a/...portal_with_lorawan_and_starter_kit.bicep → ...portal_with_lorawan_and_starter_kit.bicep b/...portal_with_lorawan_and_starter_kit.bicep → ...portal_with_lorawan_and_starter_kit.bicep
diff --git a/templates/portal_without_lorawan.bicep → templates/azure/portal_without_lorawan.bicep b/templates/portal_without_lorawan.bicep → templates/azure/portal_without_lorawan.bicep
diff --git a/templates/storage.bicep → templates/azure/storage.bicep b/templates/storage.bicep → templates/azure/storage.bicep