Fixing OGC integration tests for Cognito

.github/workflows/integration_tests.yml

@@ -27,6 +27,41 @@ jobs:
   Dev-Venue-Airflow-API:
     runs-on: ubuntu-latest
 
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup
+        uses: ./.github/actions/setup-action
+        continue-on-error: false
+
+      - name: MCP Venue Dev - Integration tests with Airflow API
+        id: mcp_venue_dev_integration_tests_with_airflow_api
+        continue-on-error: true
+        env:
+          UNITY_USER: ${{ secrets.MCP_VENUE_DEV_UNITY_USERNAME }}
+          UNITY_PASSWORD: ${{ secrets.MCP_VENUE_DEV_UNITY_PASSWORD }}
+          UNITY_CLIENT_ID: ${{ secrets.MCP_VENUE_DEV_UNITY_CLIENTID }}
+        run: |
+          pytest -vv -s --gherkin-terminal-reporter \
+          unity-test/system/integration/step_defs/test_cwl_workflows_with_airflow_api.py  \
+          --venue="dev" \
+          --airflow-endpoint=${{ github.event.inputs.MCP_VENUE_DEV_AIRFLOW_API_ENDPOINT || vars.MCP_VENUE_DEV_AIRFLOW_API_ENDPOINT }} \
+          --ogc-processes-endpoint=${{ github.event.inputs.MCP_VENUE_DEV_OGC_PROCESSES_API_ENDPOINT || vars.MCP_VENUE_DEV_OGC_PROCESSES_API_ENDPOINT }}
+
+      - name: Check Tests Results
+        if: always()
+        run: |
+          tests_status=${{ steps.mcp_venue_dev_integration_tests_with_airflow_api.outcome }}
+          echo "Tests Status: $tests_status"
+          if [ "$tests_status" != "success" ]; then
+            echo "Integration Tests with Airflow API on MCP Venue Dev failed."
+            exit 1
+          fi
+
+  Test-Venue-Airflow-API:
+    runs-on: ubuntu-latest
+
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -35,66 +70,66 @@ jobs:
       uses: ./.github/actions/setup-action
       continue-on-error: false
 
-    - name: MCP Venue Dev - Integration tests with Airflow API
-      id: mcp_venue_dev_integration_tests_with_airflow_api
+    - name: MCP Venue Test - Integration tests with Airflow API
+      id: mcp_venue_test_integration_tests_with_airflow_api
       continue-on-error: true
       env:
-        UNITY_USERNAME: ${{ secrets.MCP_VENUE_DEV_UNITY_USERNAME }}
+        UNITY_USER: ${{ secrets.MCP_VENUE_TEST_UNITY_USERNAME }}
+        UNITY_PASSWORD: ${{ secrets.MCP_VENUE_TEST_UNITY_PASSWORD }}
+        UNITY_CLIENT_ID: ${{ secrets.MCP_VENUE_TEST_UNITY_CLIENTID }}
+      run: |
+        pytest -vv -s --gherkin-terminal-reporter \
+        unity-test/system/integration/step_defs/test_cwl_workflows_with_airflow_api.py \
+        --venue="test" \
+        --airflow-endpoint=${{ github.event.inputs.MCP_VENUE_TEST_AIRFLOW_API_ENDPOINT || vars.MCP_VENUE_TEST_AIRFLOW_API_ENDPOINT }} \
+        --ogc-processes-endpoint=${{ github.event.inputs.MCP_VENUE_TEST_OGC_PROCESSES_API_ENDPOINT || vars.MCP_VENUE_TEST_OGC_PROCESSES_API_ENDPOINT }}
+
+    - name: Check Tests Results
+      if: always()
+      run: |
+        tests_status=${{ steps.mcp_venue_test_integration_tests_with_airflow_api.outcome }}
+        echo "Tests Status: $tests_status"
+        if [ "$tests_status" != "success" ]; then
+          echo "Integration Tests with Airflow API on MCP Venue Test failed."
+          exit 1
+        fi
+
+  Dev-Venue-OGC-API:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Setup
+      uses: ./.github/actions/setup-action
+      continue-on-error: false
+
+    - name: MCP Venue Dev - Integration tests with OGC API
+      id: mcp_venue_dev_integration_tests_with_ogc_api
+      continue-on-error: true
+      env:
+        UNITY_USER: ${{ secrets.MCP_VENUE_DEV_UNITY_USERNAME }}
         UNITY_PASSWORD: ${{ secrets.MCP_VENUE_DEV_UNITY_PASSWORD }}
-        UNITY_CLIENTID: ${{ secrets.MCP_VENUE_DEV_UNITY_CLIENTID }}
+        UNITY_CLIENT_ID: ${{ secrets.MCP_VENUE_DEV_UNITY_CLIENTID }}
       run: |
         pytest -vv -s --gherkin-terminal-reporter \
-        unity-test/system/integration/step_defs/test_cwl_workflows_with_airflow_api.py  \
+        unity-test/system/integration/step_defs/test_cwl_workflows_with_ogc_api.py \
         --venue="dev" \
         --airflow-endpoint=${{ github.event.inputs.MCP_VENUE_DEV_AIRFLOW_API_ENDPOINT || vars.MCP_VENUE_DEV_AIRFLOW_API_ENDPOINT }} \
         --ogc-processes-endpoint=${{ github.event.inputs.MCP_VENUE_DEV_OGC_PROCESSES_API_ENDPOINT || vars.MCP_VENUE_DEV_OGC_PROCESSES_API_ENDPOINT }}
 
     - name: Check Tests Results
       if: always()
       run: |
-        tests_status=${{ steps.mcp_venue_dev_integration_tests_with_airflow_api.outcome }}
+        tests_status=${{ steps.mcp_venue_dev_integration_tests_with_ogc_api.outcome }}
         echo "Tests Status: $tests_status"
         if [ "$tests_status" != "success" ]; then
-          echo "Integration Tests with Airflow API on MCP Venue Dev failed."
+          echo "Integration Tests with OGC API on MCP Venue Dev failed."
           exit 1
         fi
 
-#  Dev-Venue-OGC-API:
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#    - name: Checkout
-#      uses: actions/checkout@v4
-#
-#    - name: Setup
-#      uses: ./.github/actions/setup-action
-#      continue-on-error: false
-#
-#    - name: MCP Venue Dev - Integration tests with OGC API
-#      id: mcp_venue_dev_integration_tests_with_ogc_api
-#      continue-on-error: true
-#      env:
-#        UNITY_USERNAME: ${{ secrets.MCP_VENUE_DEV_UNITY_USERNAME }}
-#        UNITY_PASSWORD: ${{ secrets.MCP_VENUE_DEV_UNITY_PASSWORD }}
-#        UNITY_CLIENTID: ${{ secrets.MCP_VENUE_DEV_UNITY_CLIENTID }}
-#      run: |
-#        pytest -vv -s --gherkin-terminal-reporter \
-#        unity-test/system/integration/step_defs/test_cwl_workflows_with_ogc_api.py  \
-#        --venue="dev" \
-#        --airflow-endpoint=${{ github.event.inputs.MCP_VENUE_DEV_AIRFLOW_API_ENDPOINT || vars.MCP_VENUE_DEV_AIRFLOW_API_ENDPOINT }} \
-#        --ogc-processes-endpoint=${{ github.event.inputs.MCP_VENUE_DEV_OGC_PROCESSES_API_ENDPOINT || vars.MCP_VENUE_DEV_OGC_PROCESSES_API_ENDPOINT }}
-#
-#    - name: Check Tests Results
-#      if: always()
-#      run: |
-#        tests_status=${{ steps.mcp_venue_dev_integration_tests_with_ogc_api.outcome }}
-#        echo "Tests Status: $tests_status"
-#        if [ "$tests_status" != "success" ]; then
-#          echo "Integration Tests with OGC API on MCP Venue Dev failed."
-#          exit 1
-#        fi
-
-  Test-Venue-Airflow-API:
+  Test-Venue-OGC-API:
     runs-on: ubuntu-latest
 
     steps:
@@ -105,61 +140,26 @@ jobs:
       uses: ./.github/actions/setup-action
       continue-on-error: false
 
-    - name: MCP Venue Test - Integration tests with Airflow API
-      id: mcp_venue_test_integration_tests_with_airflow_api
+    - name: MCP Venue Test - Integration tests with OGC API
+      id: mcp_venue_test_integration_tests_with_ogc_api
       continue-on-error: true
       env:
-        UNITY_USERNAME: ${{ secrets.MCP_VENUE_TEST_UNITY_USERNAME }}
+        UNITY_USER: ${{ secrets.MCP_VENUE_TEST_UNITY_USERNAME }}
         UNITY_PASSWORD: ${{ secrets.MCP_VENUE_TEST_UNITY_PASSWORD }}
-        UNITY_CLIENTID: ${{ secrets.MCP_VENUE_TEST_UNITY_CLIENTID }}
+        UNITY_CLIENT_ID: ${{ secrets.MCP_VENUE_TEST_UNITY_CLIENTID }}
       run: |
         pytest -vv -s --gherkin-terminal-reporter \
-        unity-test/system/integration/step_defs/test_cwl_workflows_with_airflow_api.py \
+        unity-test/system/integration/step_defs/test_cwl_workflows_with_ogc_api.py \
         --venue="test" \
         --airflow-endpoint=${{ github.event.inputs.MCP_VENUE_TEST_AIRFLOW_API_ENDPOINT || vars.MCP_VENUE_TEST_AIRFLOW_API_ENDPOINT }} \
         --ogc-processes-endpoint=${{ github.event.inputs.MCP_VENUE_TEST_OGC_PROCESSES_API_ENDPOINT || vars.MCP_VENUE_TEST_OGC_PROCESSES_API_ENDPOINT }}
 
     - name: Check Tests Results
       if: always()
       run: |
-        tests_status=${{ steps.mcp_venue_test_integration_tests_with_airflow_api.outcome }}
+        tests_status=${{ steps.mcp_venue_test_integration_tests_with_ogc_api.outcome }}
         echo "Tests Status: $tests_status"
         if [ "$tests_status" != "success" ]; then
-          echo "Integration Tests with Airflow API on MCP Venue Test failed."
+          echo "Integration Tests with OGC API on MCP Venue Test failed."
           exit 1
         fi
-#
-#  Test-Venue-OGC-API:
-#    runs-on: ubuntu-latest
-#
-#    steps:
-#    - name: Checkout
-#      uses: actions/checkout@v4
-#
-#    - name: Setup
-#      uses: ./.github/actions/setup-action
-#      continue-on-error: false
-#
-#    - name: MCP Venue Test - Integration tests with OGC API
-#      id: mcp_venue_test_integration_tests_with_ogc_api
-#      continue-on-error: true
-#      env:
-#        UNITY_USERNAME: ${{ secrets.MCP_VENUE_TEST_UNITY_USERNAME }}
-#        UNITY_PASSWORD: ${{ secrets.MCP_VENUE_TEST_UNITY_PASSWORD }}
-#        UNITY_CLIENTID: ${{ secrets.MCP_VENUE_TEST_UNITY_CLIENTID }}
-#      run: |
-#        pytest -vv -s --gherkin-terminal-reporter \
-#        unity-test/system/integration/step_defs/test_cwl_workflows_with_ogc_api.py \
-#        --venue="test" \
-#        --airflow-endpoint=${{ github.event.inputs.MCP_VENUE_TEST_AIRFLOW_API_ENDPOINT || vars.MCP_VENUE_TEST_AIRFLOW_API_ENDPOINT }} \
-#        --ogc-processes-endpoint=${{ github.event.inputs.MCP_VENUE_TEST_OGC_PROCESSES_API_ENDPOINT || vars.MCP_VENUE_TEST_OGC_PROCESSES_API_ENDPOINT }}
-#
-#    - name: Check Tests Results
-#      if: always()
-#      run: |
-#        tests_status=${{ steps.mcp_venue_test_integration_tests_with_ogc_api.outcome }}
-#        echo "Tests Status: $tests_status"
-#        if [ "$tests_status" != "success" ]; then
-#          echo "Integration Tests with OGC API on MCP Venue Test failed."
-#          exit 1
-#        fi

unity-test/conftest.py

@@ -94,10 +94,9 @@ def venue(request):
 
 @pytest.fixture(scope="function")
 def fetch_token():
-    print("Fetching a new token")
-    username = os.getenv("UNITY_USERNAME")
+    username = os.getenv("UNITY_USER")
     password = os.getenv("UNITY_PASSWORD")
-    client_id = os.getenv("UNITY_CLIENTID")
+    client_id = os.getenv("UNITY_CLIENT_ID")
     region = "us-west-2"
     url = f"https://cognito-idp.{region}.amazonaws.com"
     payload = {
@@ -131,14 +130,20 @@ def eks_cluster_name(resource_name_template):
 
 
 @pytest.fixture(scope="session")
-def ogc_processes(ogc_processes_api_url):
+def ogc_processes(ogc_processes_api_url, venue):
     """
     Retrieves the OGC processes available from the given endpoint.
     """
 
     # setup Unity venue
-    unity = Unity(UnityEnvironments.DEV)
-    unity.set_venue_id("")
+    unity_envs = {
+        "dev": UnityEnvironments.DEV,
+        "test": UnityEnvironments.TEST,
+        "prod": UnityEnvironments.PROD,
+    }
+    unity = Unity(unity_envs[venue] if venue in unity_envs else "")
+    unity.set_project("unity")
+    unity.set_venue(venue)
     process_service = unity.client(UnityServices.PROCESS_SERVICE)
 
     # retrieve all OGC processes

unity-test/system/integration/features/cwl_workflows_with_airflow_api.feature

@@ -18,4 +18,4 @@ Feature: Execute CWL workflows using the Airflow API
             | SBG_PREPROCESS | cwl_dag          |
             | EMIT           | cwl_dag_modular  |
             | SBG_PREPROCESS | cwl_dag_modular  |
-            | SBG_ISOFIT     | cwl_dag_modular  |
+#           | SBG_ISOFIT     | cwl_dag_modular  |

unity-test/system/integration/features/cwl_workflows_with_ogc_api.feature

@@ -18,4 +18,4 @@ Feature: Execute CWL workflows using the OGC API
             | SBG_PREPROCESS | cwl_dag          |
             | EMIT           | cwl_dag_modular  |
             | SBG_PREPROCESS | cwl_dag_modular  |
-            | SBG_ISOFIT     | cwl_dag_modular  |
+#           | SBG_ISOFIT     | cwl_dag_modular  |