Fixing TravisCI test-deploy logic (#119)

* Fixing Travis test deploy logic
* FIxed reddis lib retrieval by moving it from branch  olfs:tomcat-11 to branch olfs:el9
Co-authored-by: Hannah Robertson <hannahilea@users.noreply.github.com>

Author: ndp-opendap

.travis.yml

@@ -18,7 +18,8 @@ services:
 branches:
   only:
     - master
-    - el9
+    - main
+    - /^(.*-test-deploy)$/
 
 notifications:
   email:
@@ -55,7 +56,7 @@ before_install:
   - pip3 install awscli
   - echo "# travis.before_install() - TRAVIS_PULL_REQUEST is $TRAVIS_PULL_REQUEST"
   - echo "# travis.before_install() -       TRAVIS_BRANCH is $TRAVIS_BRANCH"
-  - if test "$TRAVIS_PULL_REQUEST" = "false" -o "$TRAVIS_BRANCH" = "el9" ; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
+  - if [[ "$TRAVIS_PULL_REQUEST" = "false" || "$TRAVIS_BRANCH" =~ ^(.*-test-deploy)$ ]] ; then export DEPLOY_ME="true"; else export DEPLOY_ME="false"; fi
   - echo "# travis.before_install() -           DEPLOY_ME is $DEPLOY_ME"
 
 
@@ -66,11 +67,11 @@ install:
 
 stages:
   - name: BUILD_AND_TEST
-    if:  branch = master OR branch = el9
+    if: branch = master OR branch = main OR branch =~ ^(.*-test-deploy)$
   - name: BUILD
-    if:  branch = master OR branch = el9
+    if: branch = master OR branch = main OR branch =~ ^(.*-test-deploy)$
   - name: TEST_DEPLOYED_IMAGE
-    if: ((branch = master) and (type != pull_request)) or (branch = el9)
+    if: ((branch = master or branch = main) and (type != pull_request)) or (branch =~ ^(.*-test-deploy)$)
   - name: disabled
     if: branch = disabled
 
@@ -249,13 +250,5 @@ deploy:
   - provider: script
     script: bash "$TRAVIS_BUILD_DIR/travis/deploy_to_docker_hub.sh"
     on:
-      branch: master
-      condition: $DEPLOY_ME = "true"
-
-  - provider: script
-    script: bash "$TRAVIS_BUILD_DIR/travis/deploy_to_docker_hub.sh"
-    on:
-      branch: el9
-      condition: $DEPLOY_ME = "true"
-
-
+      all_branches: true
+      condition: ( "$DEPLOY_ME" = "true" )

el9-builds/ngap/Dockerfile

@@ -426,7 +426,7 @@ RUN set -e \
     && git clone https://github.com/OPENDAP/olfs \
     #&& git clone --depth 1 https://github.com/OPENDAP/olfs \
     && cd olfs \
-    && git checkout tomcat-11 \
+    && git checkout el9 \
     && cd .. \
     && echo "$HR2" >&2 \
     && echo "Copying elasticache client" >&2 \