Fixes from test run (#15)

* Update Dockerfile

Change comment to work with docker file formatting

* Update undeploy.sh

Fixed comment formatting for bash

* Create ext-order-service.yaml

* Update test.sh

Fix syntax

* Update test.sh

Fixed to support insecure SSH

Author: RichardExley

grabdish/artillery/test.sh

@@ -1,4 +1,7 @@
 #!/bin/bash
+##
+## Copyright (c) 2021 Oracle and/or its affiliates.
+## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 set -e
 
@@ -17,9 +20,9 @@ export RUN=`cat $NEXT_RUN_FILE`
 RUN=$((RUN+1))
 echo $RUN > $NEXT_RUN_FILE
 
-for i in {1..1}
+for i in {1..20}
 do
     export VU=$i
-    ./node_modules/artillery/bin/artillery run art-placeorder.yaml &
+    ./node_modules/artillery/bin/artillery run --insecure art-placeorder.yaml &
 done
 wait

grabdish/inventory-nodejs/inventory/Dockerfile

@@ -1,8 +1,7 @@
-/*
- ** Copyright (c) 2021 Oracle and/or its affiliates.
- ** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
- */
- FROM oraclelinux:7-slim
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+FROM oraclelinux:7-slim
 
 ARG release=19
 ARG update=5

grabdish/inventory-nodejs/undeploy.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
-** Copyright (c) 2021 Oracle and/or its affiliates.
-** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
-
+# Copyright (c) 2021 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 echo delete inventory-nodejs deployment...
 

grabdish/k6/test.sh

@@ -1,8 +1,7 @@
-
+#!/bin/bash
 ##
 ## Copyright (c) 2021 Oracle and/or its affiliates.
 ## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
-export VUS="$1"
 
 set -e
 
@@ -17,17 +16,8 @@ if [ ! -f "$NEXT_RUN_FILE" ]; then
     echo 0 > $NEXT_RUN_FILE
 fi
 
-#export RUN=`cat $NEXT_RUN_FILE`
-#RUN=$((RUN+1))
-#echo $RUN > $NEXT_RUN_FILE
-
-#echo Warming up for 30 seconds
-#./k6 run --vus $VUS --duration "20s" --address localhost:6566 placeorder.js > /dev/null
-
-#sleep 10
-
 export RUN=`cat $NEXT_RUN_FILE`
 RUN=$((RUN+1))
 echo $RUN > $NEXT_RUN_FILE
 
-./k6 run --vus 20 --duration "30s" --address localhost:6566 --insecure-skip-tls-verify true placeorder.js
+./k6 run --vus 20 --duration "30s" --address localhost:6566 --insecure-skip-tls-verify placeorder.js

grabdish/order-helidon/ext-order-service.yaml

@@ -0,0 +1,20 @@
+##
+## Copyright (c) 2021 Oracle and/or its affiliates.
+## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+apiVersion: v1
+kind: Service
+metadata:
+  name: ext-order
+  labels:
+    app: order
+  annotations:
+    service.beta.kubernetes.io/oci-load-balancer-ssl-ports: "443"
+    service.beta.kubernetes.io/oci-load-balancer-tls-secret: ssl-certificate-secret
+spec:
+  type: LoadBalancer
+  ports:
+  - port: 443
+    name: https
+    targetPort: 8080
+  selector:
+    app: order