link pytests to docker builds

CIROH-UA · Jan 16, 2025 · 5b7ad37 · 5b7ad37
1 parent 3dc31f4
commit 5b7ad37
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/datastream_python.yml b/.github/workflows/datastream_python.yml
@@ -9,12 +9,14 @@ on:
     paths:
       - 'python_tools/**'
       - '.github/workflows/datastream_python.yml'
+      - '.github/workflows/build_test_docker_x86.yml'
   pull_request:
     branches:
       - main    
     paths:      
       - 'python_tools/**'
       - '.github/workflows/datastream_python.yml'
+      - '.github/workflows/build_test_docker_x86.yml'
 permissions:
   contents: read
 jobs:

diff --git a/.github/workflows/forcingprocessor.yml b/.github/workflows/forcingprocessor.yml
@@ -9,12 +9,15 @@ on:
     paths:
       - 'forcingprocessor/**'
       - '.github/workflows/forcingprocessor.yml'
+      - '.github/workflows/build_test_docker_x86.yml'
   pull_request:
     branches:
       - main    
     paths:      
       - 'forcingprocessor/**'
       - '.github/workflows/forcingprocessor.yml'
+      - '.github/workflows/build_test_docker_x86.yml'
+
 permissions:
   contents: read
 jobs:

diff --git a/research_datastream/terraform/test/docker_loginNpush.sh b/research_datastream/terraform/test/docker_loginNpush.sh
@@ -5,7 +5,7 @@ DOCKERHUB_USERNAME="awiciroh"
 
 if [ "$(echo $DOCKERHUB_TOKEN | docker login -u $DOCKERHUB_USERNAME --password-stdin)" == "Login Succeeded" ]; then             
     echo "Docker login successful"
-    /home/ec2-user/ngen-datastream/scripts/docker_builds.sh -e -d -f -p -m linux/arm64 -t latest-arm64 >> /home/ec2-user/ngen-datastream/docker_build_log.txt
+    /home/ec2-user/ngen-datastream/scripts/docker_builds.sh -e -d -f -p >> /home/ec2-user/ngen-datastream/docker_build_log.txt
     echo "Push complete"
 else
     echo "Docker login failed"

diff --git a/research_datastream/terraform/test/execution_gp_arm_docker_buildNtester.json b/research_datastream/terraform/test/execution_gp_arm_docker_buildNtester.json
@@ -2,7 +2,7 @@
   "commands"  : [
     "runuser -l ec2-user -c 'rm -rf /home/ec2-user/ngen-datastream && docker rmi -f $(docker images -aq)'",     
     "runuser -l ec2-user -c 'cd /home/ec2-user && git clone https://github.com/CIROH-UA/ngen-datastream.git'",    
-    "runuser -l ec2-user -c '/home/ec2-user/ngen-datastream/scripts/docker_builds.sh -e -f -d -t latest-arm64 -m linux/arm64'",
+    "runuser -l ec2-user -c '/home/ec2-user/ngen-datastream/scripts/docker_builds.sh -e -f -d'",
     "runuser -l ec2-user -c '/home/ec2-user/ngen-datastream/scripts/stream.sh -s 202006200100 -e 202006200200 -C NWM_RETRO_V3 -d /home/ec2-user/ngen-datastream/data/datastream_test -g https://ngen-datastream.s3.us-east-2.amazonaws.com/palisade.gpkg -R /home/ec2-user/ngen-datastream/configs/ngen/realization_sloth_nom_cfe_pet.json'",
     "runuser -l ec2-user -c '/home/ec2-user/ngen-datastream/research_datastream/terraform/test/docker_loginNpush.sh >> /home/ec2-user/ngen-datastream/docker_login_log.txt'",
     "runuser -l ec2-user -c 'aws s3 cp /home/ec2-user/ngen-datastream/docker_login_log.txt s3://ciroh-community-ngen-datastream/docker_login_log.txt'",