Automation fix (#48)

* Adjusted template sizes units * Shuffled test execution order
SolaceProducts · Feb 8, 2022 · feba4da · feba4da
1 parent 8c0f355
commit feba4da
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 42 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -73,16 +73,6 @@ jobs:
         remote_command "/opt/scripts/helmDeleteBroker helmtest"
         rm -f out.txt
 
-    - name: Deploy non-HA broker and test, using template install
-      run: |
-        shopt -s expand_aliases; alias remote_command=${REMOTE_COMMAND}
-        remote_command "/opt/scripts/templateInstallBroker templatenonha /opt/templates/eventbroker_singlenode_template.yaml"
-        remote_command "/opt/scripts/testBroker templatenonha my-release-pubsubplus" | tee out.txt
-        grep "aurelia" out.txt # web portal access
-        grep 100000 out.txt # smf messaging
-        remote_command "/opt/scripts/templateDeleteBroker templatenonha /opt/templates/eventbroker_singlenode_template.yaml"
-        rm -f out.txt
-
     - name: Deploy HA broker and test, using template install
       run: |
         shopt -s expand_aliases; alias remote_command=${REMOTE_COMMAND}
@@ -94,6 +84,16 @@ jobs:
         grep 100000 out.txt # smf messaging
         remote_command "/opt/scripts/templateDeleteBroker templateha /opt/templates/eventbroker_ha_template.yaml"
 
+    - name: Deploy non-HA broker and test, using template install
+      run: |
+        shopt -s expand_aliases; alias remote_command=${REMOTE_COMMAND}
+        remote_command "/opt/scripts/templateInstallBroker templatenonha /opt/templates/eventbroker_singlenode_template.yaml"
+        remote_command "/opt/scripts/testBroker templatenonha my-release-pubsubplus" | tee out.txt
+        grep "aurelia" out.txt # web portal access
+        grep 100000 out.txt # smf messaging
+        remote_command "/opt/scripts/templateDeleteBroker templatenonha /opt/templates/eventbroker_singlenode_template.yaml"
+        rm -f out.txt
+
     - name: Cleanup
       if: ${{ always() }}
       run: |

diff --git a/templates/eventbroker_ha_template.yaml b/templates/eventbroker_ha_template.yaml
@@ -659,10 +659,10 @@ objects:
           resources:
             requests:
               cpu: "2"
-              memory: 3.4Gi
+              memory: 4025Mi
             limits:
               cpu: "2"
-              memory: 3.4Gi
+              memory: 4025Mi
           livenessProbe:
             tcpSocket:
               port: 8080
@@ -688,25 +688,25 @@ objects:
           - name: UMASK
             value: "0022"
           command:
-           - bash
-           - "-ec"
-           - |
-             source /mnt/disks/solace/init.sh
-             # not using postinstall hooks because of order dependencies
-             # launch config check then PubSub+ so VCMR can provide return code
-             nohup /mnt/disks/solace/startup-broker.sh &
-             /usr/sbin/boot.sh
+          - bash
+          - "-ec"
+          - |
+            source /mnt/disks/solace/init.sh
+            # not using postinstall hooks because of order dependencies
+            # launch config check then PubSub+ so VCMR can provide return code
+            nohup /mnt/disks/solace/startup-broker.sh &
+            /usr/sbin/boot.sh
 
           lifecycle:
             preStop:
               exec:
                 command:
-                 - bash
-                 - "-ec"
-                 - |
-                   while ! pgrep solacedaemon ; do sleep 1; done
-                   killall solacedaemon;
-                   while [ ! -d /usr/sw/var/db.upgrade ]; do sleep 1; done;
+                - bash
+                - "-ec"
+                - |
+                  while ! pgrep solacedaemon ; do sleep 1; done
+                  killall solacedaemon;
+                  while [ ! -d /usr/sw/var/db.upgrade ]; do sleep 1; done;
           volumeMounts:
           - name: podinfo
             mountPath: /etc/podinfo

diff --git a/templates/eventbroker_singlenode_template.yaml b/templates/eventbroker_singlenode_template.yaml
@@ -375,10 +375,10 @@ objects:
           resources:
             requests:
               cpu: "2"
-              memory: 3.4Gi
+              memory: 4025Mi
             limits:
               cpu: "2"
-              memory: 3.4Gi
+              memory: 4025Mi
           livenessProbe:
             tcpSocket:
               port: 8080
@@ -404,24 +404,24 @@ objects:
           - name: UMASK
             value: "0022"
           command:
-           - bash
-           - "-ec"
-           - |
-             source /mnt/disks/solace/init.sh
-             # not using postinstall hooks because of order dependencies
-             # launch config check - readiness check script will be launched by readinessProbe
-             nohup /mnt/disks/solace/startup-broker.sh &
-             /usr/sbin/boot.sh
+          - bash
+          - "-ec"
+          - |
+            source /mnt/disks/solace/init.sh
+            # not using postinstall hooks because of order dependencies
+            # launch config check - readiness check script will be launched by readinessProbe
+            nohup /mnt/disks/solace/startup-broker.sh &
+            /usr/sbin/boot.sh
           lifecycle:
             preStop:
               exec:
                 command:
-                 - bash
-                 - "-ec"
-                 - |
-                   while ! pgrep solacedaemon ; do sleep 1; done
-                   killall solacedaemon;
-                   while [ ! -d /usr/sw/var/db.upgrade ]; do sleep 1; done;
+                - bash
+                - "-ec"
+                - |
+                  while ! pgrep solacedaemon ; do sleep 1; done
+                  killall solacedaemon;
+                  while [ ! -d /usr/sw/var/db.upgrade ]; do sleep 1; done;
           volumeMounts:
           - name: podinfo
             mountPath: /etc/podinfo