trig

s-tuli · Nov 5, 2019 · e0e265b · e0e265b
1 parent 5fa7a2f
commit e0e265b
Showing 1 changed file with 15 additions and 26 deletions.
diff --git a/.github/workflows/bikes.yml b/.github/workflows/bikes.yml
@@ -12,18 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - uses: actions/checkout@master
-
-    - name: Create valid child namespace name
-      id: generate-child-space-name
-      run: |
-        #branch=${GITHUB_HEAD_REF::63}
-        
-        branch="A###@###232ff//////$!\\\////////ffffffffffffffffff%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%fffffffffffffffffffffffffffffffffff%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff424234dfssfgsffsfsfsffsfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff___________________________------------------------------------------------------------------------------------------------------------"
-        branch=${branch::41}
-        echo $branch
-        branch=$(echo ${branch//[!0-9a-zA-Z]/-} | tr '[:upper:]' '[:lower:]' | sed -e 's/^-/z/' -e 's/-$/z/')
-        echo ::set-output name=valid_child_namespace::$branch
+    - uses: actions/checkout@master    
 
     - uses: azure/docker-login@releases/v1
       with:
@@ -41,24 +30,24 @@ jobs:
         cluster-name: ${{ secrets.CLUSTER_NAME }}
         resource-group: ${{ secrets.RESOURCE_GROUP }}
 
-    #- name: Create valid child namespace name
-    #  id: generate-child-space-name
-    #  run: |
-    #    branch=${GITHUB_HEAD_REF::63}
-    #    branch=$(echo ${branch//[!0-9a-zA-Z]/-} | tr '[:upper:]' '[:lower:]' | sed -e 's/^-/n/' -e 's/-$/n/')
-    #    echo ::set-output name=valid_child_namespace::$branch            
+    - name: Create valid child namespace name
+      id: generate-child-space-name
+      run: |
+        branch=${GITHUB_HEAD_REF::41}        
+        branch=$(echo ${branch//[!0-9a-zA-Z]/-} | tr '[:upper:]' '[:lower:]' | sed -e 's/^-/z/' -e 's/-$/z/')
+        echo ::set-output name=valid_child_space_name::$branch         
     
     - name: Create child namespaces and add Dev Spaces labels
       run:  |
-        if [ -n "$(kubectl get namespace ${{steps.generate-child-space-name.outputs.valid_child_namespace}} --ignore-not-found -o name)" ]; then exit 0; fi
-        kubectl create namespace ${{steps.generate-child-space-name.outputs.valid_child_namespace}}
-        kubectl label namespace ${{steps.generate-child-space-name.outputs.valid_child_namespace}} azds.io/parent-space=${{ secrets.MASTER_SPACE }} 
-        kubectl label namespace ${{steps.generate-child-space-name.outputs.valid_child_namespace}} azds.io/space=true
-        kubectl label namespace ${{steps.generate-child-space-name.outputs.valid_child_namespace}} azds.io/pull-request-space=true
+        if [ -n "$(kubectl get namespace ${{steps.generate-child-space-name.outputs.valid_child_space_name}} --ignore-not-found -o name)" ]; then exit 0; fi
+        kubectl create namespace ${{steps.generate-child-space-name.outputs.valid_child_space_name}}
+        kubectl label namespace ${{steps.generate-child-space-name.outputs.valid_child_space_name}} azds.io/parent-space=${{ secrets.MASTER_SPACE }} 
+        kubectl label namespace ${{steps.generate-child-space-name.outputs.valid_child_space_name}} azds.io/space=true
+        kubectl label namespace ${{steps.generate-child-space-name.outputs.valid_child_space_name}} azds.io/pull-request-space=true
         
     - uses: azure/k8s-actions/k8s-create-secret@master
       with:
-        namespace: ${{ steps.generate-child-space-name.outputs.valid_child_namespace }}
+        namespace: ${{ steps.generate-child-space-name.outputs.valid_child_space_name }}
         container-registry-url: ${{ secrets.CONTAINER_REGISTRY }}
         container-registry-username: ${{ secrets.REGISTRY_USERNAME }}
         container-registry-password: ${{ secrets.REGISTRY_PASSWORD }}
@@ -67,7 +56,7 @@ jobs:
     - name: Helm Install PR
       run: |
         helm init --upgrade --wait
-        helm upgrade --install --namespace ${{steps.generate-child-space-name.outputs.valid_child_namespace}} bikesharing-${{steps.generate-child-space-name.outputs.valid_child_namespace}} samples/BikeSharingApp/Bikes/charts/bikes \
+        helm upgrade --install --namespace ${{steps.generate-child-space-name.outputs.valid_child_space_name}} bikesharing-${{steps.generate-child-space-name.outputs.valid_child_space_name}} samples/BikeSharingApp/Bikes/charts/bikes \
           --set image.repository=${{ secrets.CONTAINER_REGISTRY }}/bikes \
           --set image.tag=$GITHUB_SHA \
           --set imagePullSecrets[0].name=${{ secrets.IMAGE_PULL_SECRET }}
@@ -76,4 +65,4 @@ jobs:
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}  
         host: ${{ secrets.HOST }}
-        child-space: ${{steps.generate-child-space-name.outputs.valid_child_namespace}}
+        child-space: ${{steps.generate-child-space-name.outputs.valid_child_space_name}}