script imports

.github/workflows/build_test_docker_arm.yml

@@ -42,6 +42,7 @@ jobs:
           cd research_datastream/terraform
           terraform init
           terraform validate
+          ./test/import_resources.sh
           terraform apply -var-file=./test/variables_gitactions_arm.tfvars -auto-approve
           sleep 60
       - name: Set permissions

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"
-    ./scripts/docker_builds.sh -p >> ./docker_build_log.txt
+    /home/ec2-user/ngen-datastream/scripts/docker_builds.sh -p -s >> /home/ec2-user/ngen-datastream/docker_build_log.txt
     echo "Push complete"
 else
     echo "Docker login failed"

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 'git clone -b test_terraform https://github.com/CIROH-UA/ngen-datastream.git'",
-    "runuser -l ec2-user -c '/home/ec2-user/ngen-datastream/scripts/docker_builds.sh -b'",
+    "runuser -l ec2-user -c '/home/ec2-user/ngen-datastream/scripts/docker_builds.sh -b -s'",
     "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://ngen-datastream/docker_login_log.txt'",
     "runuser -l ec2-user -c 'aws s3 cp /home/ec2-user/ngen-datastream/docker_build_log.txt s3://ngen-datastream/docker_build_log.txt'"

research_datastream/terraform/test/variables_gitactions_arm.tfvars

@@ -1,14 +1,14 @@
-region                = "us-east-1"
-sm_name               = "datastreamconductor_github_actions_arm"
-sm_role_name          = "datastreamconductor_role_github_actions_arm"
-starter_lambda_name   = "ec2start_ami_github_actions_arm"
-commander_lambda_name = "ec2commander_github_actions_arm"
-poller_lambda_name    = "CommandPoller_github_actions_arm"
-checker_lambda_name   = "S3ObjectChecker_github_actions_arm"
-stopper_lambda_name   = "EC2Stopper_github_actions_arm"
-lambda_policy_name    = "datastream_lambda_policy_github_actions_arm"
-lambda_role_name      = "datastream_lambda_role_github_actions_arm"
-lambda_invoke_policy_name = "datastream_lambda_invoke_policy_github_actions_arm"
-ec2_role              = "datastream_ec2_role_github_actions_arm"
-ec2_policy_name       = "datastream_ec2_policy_github_actions_arm"
-profile_name          = "datastream_ec2_profile_github_actions_arm"
+region="us-east-1"
+sm_name="datastreamconductor_github_actions_arm"
+sm_role_name="datastreamconductor_role_github_actions_arm"
+starter_lambda_name="ec2start_ami_github_actions_arm"
+commander_lambda_name="ec2commander_github_actions_arm"
+poller_lambda_name="CommandPoller_github_actions_arm"
+checker_lambda_name="S3ObjectChecker_github_actions_arm"
+stopper_lambda_name="EC2Stopper_github_actions_arm"
+lambda_policy_name="datastream_lambda_policy_github_actions_arm"
+lambda_role_name="datastream_lambda_role_github_actions_arm"
+lambda_invoke_policy_name="datastream_lambda_invoke_policy_github_actions_arm"
+ec2_role="datastream_ec2_role_github_actions_arm"
+ec2_policy_name="datastream_ec2_policy_github_actions_arm"
+profile_name="datastream_ec2_profile_github_actions_arm"

scripts/docker_builds.sh

@@ -13,12 +13,15 @@ TAG="latest$PLATORM_TAG"
 
 BUILD="no"
 PUSH="no"
+SKIP_DEPS="no"
 while getopts "bp" flag; do
  case $flag in
    b) BUILD="yes"
    ;;
    p) PUSH="yes"
    ;;
+   s) SKIP_DEPS="yes"
+   ;;   
    \?)
    ;;
  esac
@@ -28,8 +31,9 @@ if [ "$BUILD" = "yes" ]; then
 
   cd $DOCKER_DIR
   echo "Building docker from "$DOCKER_DIR
-
-  docker build -t awiciroh/datastream-deps:$TAG -f Dockerfile.datastream-deps . --no-cache --build-arg TAG_NAME=$TAG --build-arg ARCH=$PLATFORM --platform linux/$PLATFORM
+  if [ "$SKIP_DEPS" = "no" ]; then
+    docker build -t awiciroh/datastream-deps:$TAG -f Dockerfile.datastream-deps . --no-cache --build-arg TAG_NAME=$TAG --build-arg ARCH=$PLATFORM --platform linux/$PLATFORM
+  fi
 
   if [ -d "$DOCKER_DATASTREAM" ]; then
     rm -rf $DOCKER_DATASTREAM
@@ -50,7 +54,9 @@ fi
 
 if [ "$PUSH" = "yes" ]; then
     echo "Pushing docker containers"
-    docker push awiciroh/datastream-deps:$TAG
+    if [ "$SKIP_DEPS" = "no" ]; then
+      docker push awiciroh/datastream-deps:$TAG
+    fi
     docker push awiciroh/datastream:$TAG
     docker push awiciroh/forcingprocessor:$TAG
     echo "Docker containers have been pushed to awiciroh dockerhub!"