Просмотр исходного кода

Add Azure testnet to automation (#6911)

* Add Azure testnet to automation
Dan Albert 6 лет назад
Родитель
Сommit
f27c11ccd8

+ 1 - 1
net/scripts/azure-provider.sh

@@ -222,8 +222,8 @@ cloud_CreateInstances() {
     --tags testnet
     --image UbuntuLTS
     --size "$machineType"
+    --ssh-key-values "$(cat "${sshPrivateKey}".pub)"
     --location "$zone"
-    --generate-ssh-keys
     --nsg "$nsgName"
   )
 

+ 19 - 0
system-test/testnet-performance/azure-cpu-only-perf-5-node.yml

@@ -0,0 +1,19 @@
+steps:
+  - command: "system-test/testnet-performance/testnet-automation.sh"
+    label: "Azure - CPU Only 5 Node"
+    env:
+      UPLOAD_RESULTS_TO_SLACK: "true"
+      CLOUD_PROVIDER: "azure"
+      TESTNET_TAG: "azure-perf-cpu-only"
+      RAMP_UP_TIME: 0
+      TEST_DURATION_SECONDS: 600
+      NUMBER_OF_VALIDATOR_NODES: 5
+      ENABLE_GPU: "false"
+      VALIDATOR_NODE_MACHINE_TYPE: "Standard_D16s_v3"
+      NUMBER_OF_CLIENT_NODES: 2
+      CLIENT_OPTIONS: "bench-tps=2=--tx_count 15000 --thread-batch-sleep-ms 250"
+      TESTNET_ZONES: "westus"
+      USE_PUBLIC_IP_ADDRESSES: "true"
+      ADDITIONAL_FLAGS: ""
+    agents:
+      - "queue=testnet-deploy"

+ 23 - 0
system-test/testnet-performance/testnet-automation.sh

@@ -108,6 +108,19 @@ EOF
   label: "Delete Testnet"
   agents:
     - "queue=testnet-deploy"
+EOF
+  ) | buildkite-agent pipeline upload
+  ;;
+  azure)
+  (
+    cat <<EOF
+- wait: ~
+  continue_on_failure: true
+
+- command: "net/azure.sh delete -p ${TESTNET_TAG}"
+  label: "Delete Testnet"
+  agents:
+    - "queue=testnet-deploy"
 EOF
   ) | buildkite-agent pipeline upload
   ;;
@@ -163,6 +176,16 @@ function launchTestnet() {
         ${TESTNET_CLOUD_ZONES[@]/#/"-z "} \
         ${ADDITIONAL_FLAGS[@]/#/" "}
       ;;
+    azure)
+    # shellcheck disable=SC2068
+    # shellcheck disable=SC2086
+      net/azure.sh create \
+        -n "$NUMBER_OF_VALIDATOR_NODES" -c "$NUMBER_OF_CLIENT_NODES" \
+        $maybeCustomMachineType "$VALIDATOR_NODE_MACHINE_TYPE" $maybeEnableGpu \
+        -p "$TESTNET_TAG" $maybeCreateAllowBootFailures $maybePublicIpAddresses \
+        ${TESTNET_CLOUD_ZONES[@]/#/"-z "} \
+        ${ADDITIONAL_FLAGS[@]/#/" "}
+      ;;
     colo)
     # shellcheck disable=SC2068
     # shellcheck disable=SC2086