Rebase

solana-labs · Mar 16, 2020 · 7319833 · 7319833
1 parent 1f7276b
commit 7319833
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/system-test/automation_utils.sh b/system-test/automation_utils.sh
@@ -112,23 +112,15 @@ function upload_results_to_slack() {
     BUILDKITE_BUILD_URL="https://buildkite.com/solana-labs/"
   fi
 
-<<<<<<< HEAD
   GRAFANA_URL="https://metrics.solana.com:3000/d/monitor-${CHANNEL:-edge}/cluster-telemetry-${CHANNEL:-edge}?var-testnet=${TESTNET_TAG:-testnet-automation}&from=${TESTNET_START_UNIX_MSECS:-0}&to=${TESTNET_FINISH_UNIX_MSECS:-0}"
-=======
-  GRAFANA_URL="https://metrics.solana.com:3000/d/testnet-${CHANNEL:-edge}/testnet-monitor-${CHANNEL:-edge}?var-testnet=${TESTNET_TAG:-testnet-automation}&from=${TESTNET_START_UNIX_MSECS:-0}&to=${TESTNET_FINISH_UNIX_MSECS:-0}"
->>>>>>> Refactor automation utilities
 
   [[ -n $RESULT_DETAILS ]] || RESULT_DETAILS="Undefined"
   [[ -n $TEST_CONFIGURATION ]] || TEST_CONFIGURATION="Undefined"
 
   payLoad="$(cat <<EOF
 {
 "blocks": [
-<<<<<<< HEAD
         {
-=======
-  	{
->>>>>>> Refactor automation utilities
 			"type": "section",
 			"text": {
 				"type": "mrkdwn",
@@ -180,11 +172,7 @@ function upload_results_to_slack() {
 		{
 			"type": "divider"
 		},
-<<<<<<< HEAD
-                {
-=======
-  	{
->>>>>>> Refactor automation utilities
+    {
 			"type": "section",
 			"text": {
 				"type": "mrkdwn",

diff --git a/system-test/testnet-automation.sh b/system-test/testnet-automation.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-# shellcheck disable=SC2034
+# shellcheck disable=SC1090
 # shellcheck disable=SC1091
 source "$(dirname "$0")"/automation_utils.sh