Re-enable integration tests (TraceMachina#1915)

Author: palfrey

deployment-examples/docker-compose/docker-compose.yml

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version: '3.4'
-
 services:
   nativelink_local_cas:
     image: trace_machina/nativelink:latest
@@ -52,6 +50,8 @@ services:
     ports: [ "50052:50052/tcp" ]
     command: |
       nativelink /root/scheduler.json5
+    depends_on:
+      - nativelink_local_cas
 
   nativelink_executor:
     image: trace_machina/nativelink:latest
@@ -72,3 +72,6 @@ services:
       SCHEDULER_ENDPOINT: nativelink_scheduler
     command: |
       nativelink /root/worker.json5
+    depends_on:
+      - nativelink_local_cas
+      - nativelink_scheduler

run_integration_tests.sh

@@ -40,7 +40,7 @@ Usage:
   run_integration_tests.sh [TEST_PATTERNS...]
 
 TEST_PATTERNS: Name of test you wish to execute. Wildcard (*) supported.
-               Default: '*'
+               Default: '*.sh'
 EOT
         ;;
     -*)
@@ -60,7 +60,7 @@ if ! docker --version; then
 fi
 
 if [[ ${#TEST_PATTERNS[@]} -eq 0 ]]; then
-    TEST_PATTERNS=("*")
+    TEST_PATTERNS=("*.sh")
 fi
 
 SELF_DIR=$(realpath "$(dirname "$0")")
@@ -96,7 +96,7 @@ export NATIVELINK_DIR="$CACHE_DIR/nativelink"
 mkdir -p "$NATIVELINK_DIR"
 
 for pattern in "${TEST_PATTERNS[@]}"; do
-    find "$SELF_DIR/integration_tests/" -name "$pattern" -type f -print0 | grep -v buildstream | while IFS= read -r -d $'\0' fullpath; do
+    find "$SELF_DIR/integration_tests/" -name "$pattern" -type f -print0 | while IFS= read -r -d $'\0' fullpath; do
         # Cleanup.
         echo "Cleaning up cache directories NATIVELINK_DIR: $NATIVELINK_DIR"
         echo "Checking for existence of the NATIVELINK_DIR"
@@ -109,11 +109,13 @@ for pattern in "${TEST_PATTERNS[@]}"; do
         bazel --output_base="$BAZEL_CACHE_DIR" clean
         FILENAME=$(basename "$fullpath")
         echo "Running test $FILENAME"
-        sudo docker compose up -d
+        sudo env RUST_LOG=info docker compose up -d
         if perl -e 'alarm shift; exec @ARGV' 30 bash -c 'until sudo docker compose logs | grep -q "Ready, listening on"; do sleep 1; done'; then
             echo "String 'Ready, listening on' found in the logs."
         else
             echo "String 'Ready, listening on' not found in the logs within the given time."
+            sudo docker compose logs
+            exit 1
         fi
         set +e
         bash -euo pipefail "$fullpath"