fix

Signed-off-by: Yuri Shkuro <[email protected]>

.github/workflows/ci-validation-of-shell-scripts.yml → .github/workflows/ci-lint-shell-scripts.yml

@@ -1,4 +1,4 @@
-name: Validation Of Shell Scripts
+name: Lint Shell Scripts
 
 on:
   push:
@@ -11,7 +11,7 @@ permissions:
   contents: read
 
 jobs:
-  validation-of-shell-scripts:
+  link-shell-scripts:
     runs-on: ubuntu-latest
 
     steps:
@@ -20,17 +20,11 @@ jobs:
       with:
         egress-policy: audit
 
-    - name: check out code 
+    - name: check out code
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     - name: Install shellcheck
       run: sudo apt-get install shellcheck
 
     - name: Run shellcheck
       run: shellcheck scripts/*.sh
-
-
-
-
-
-

scripts/es-integration-test.sh

@@ -1,19 +1,22 @@
 #!/bin/bash
 
 PS4='T$(date "+%H:%M:%S") '
-set -euxf -o pipefail
+set -euf -o pipefail
 
 # use global variables to reflect status of db
 db_is_up=
 
 usage() {
-  echo $"Usage: $0 <elasticsearch|opensearch> <version>"
+  echo "Usage: $0 <backend> <backend_version> <jaeger_version>"
+  echo "  backend:         elasticsearch | opensearch"
+  echo "  backend_version: major version, e.g. 7.x"
+  echo "  jaeger_version:  major version, e.g. v1 | v2"
   exit 1
 }
 
 check_arg() {
   if [ ! $# -eq 3 ]; then
-    echo "ERROR: need exactly three arguments, <elasticsearch|opensearch> <image> <jaeger-version>"
+    echo "ERROR: need exactly three arguments"
     usage
   fi
 }
@@ -102,7 +105,9 @@ main() {
   local es_version=$2
   local j_version=$3
 
-  # bring_up_storage "${distro}" "${es_version}"
+  set -x
+
+  bring_up_storage "${distro}" "${es_version}"
 
   if [[ "${j_version}" == "v2" ]]; then
     STORAGE=${distro} SPAN_STORAGE_TYPE=${distro} make jaeger-v2-storage-integration-test