update gh workflow

Author: jonhealy1

.github/workflows/cicd.yml

@@ -15,7 +15,6 @@ jobs:
     timeout-minutes: 20
 
     services:
-
       elasticsearch_8_svc:
         image: docker.elastic.co/elasticsearch/elasticsearch:8.11.0
         env:
@@ -63,22 +62,31 @@ jobs:
           OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m
         ports:
           - 9202:9202
+
     strategy:
       matrix:
         python-version: [ "3.8", "3.9", "3.10", "3.11", "3.12"]
+        backend: [ "elasticsearch7", "elasticsearch8", "opensearch"]
 
-    name: Python ${{ matrix.python-version }} testing
+    name: Python ${{ matrix.python-version }} testing with ${{ matrix.backend }}
 
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
 
-      # Setup Python (faster than using Python container)
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
+      - name: Cache pipenv packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/Pipfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+
       - name: Lint code
         if: ${{ matrix.python-version == 3.11 }}
         run: |
@@ -101,35 +109,17 @@ jobs:
         run: |
           pip install ./stac_fastapi/opensearch[dev,server]
 
-      - name: Run test suite against Elasticsearch 7.x
-        run: |
-          pipenv run pytest -svvv
-        env:
-          ENVIRONMENT: testing
-          ES_PORT: 9400
-          ES_HOST: 172.17.0.1
-          ES_USE_SSL: false
-          ES_VERIFY_CERTS: false
-          BACKEND: elasticsearch
-
-      - name: Run test suite against Elasticsearch 8.x
+      - name: Install pytest-timeout
         run: |
-          pipenv run pytest -svvv
-        env:
-          ENVIRONMENT: testing
-          ES_PORT: 9200
-          ES_HOST: 172.17.0.1
-          ES_USE_SSL: false
-          ES_VERIFY_CERTS: false
-          BACKEND: elasticsearch
+          pip install pytest-timeout
 
-      - name: Run test suite against OpenSearch 2.11.1
+      - name: Run test suite
         run: |
-          pipenv run pytest -svvv
+          pipenv run pytest -svvv --timeout=300
         env:
           ENVIRONMENT: testing
-          ES_PORT: 9202
+          ES_PORT: ${{ matrix.backend == 'elasticsearch7' && '9400' || matrix.backend == 'elasticsearch8' && '9200' || '9202' }}
           ES_HOST: 172.17.0.1
           ES_USE_SSL: false
           ES_VERIFY_CERTS: false
-          BACKEND: opensearch
+          BACKEND: ${{ matrix.backend == 'elasticsearch7' && 'elasticsearch' || matrix.backend == 'elasticsearch8' && 'elasticsearch' || 'opensearch' }}