Merge branch 'add-earthkit-geo'

ecmwf-actions · May 2, 2024 · 188f2c6 · 188f2c6
2 parents 9b5a813 + f3e96b0
commit 188f2c6
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 1 deletion.
diff --git a/.github/workflows/downstream-ci-hpc.yml b/.github/workflows/downstream-ci-hpc.yml
@@ -11,6 +11,9 @@ name: downstream-ci-hpc
       earthkit-data:
         required: false
         type: string
+      earthkit-geo:
+        required: false
+        type: string
       earthkit-meteo:
         required: false
         type: string
@@ -80,6 +83,7 @@ jobs:
       atlas: ${{ steps.setup.outputs.atlas }}
       cfgrib: ${{ steps.setup.outputs.cfgrib }}
       earthkit-data: ${{ steps.setup.outputs.earthkit-data }}
+      earthkit-geo: ${{ steps.setup.outputs.earthkit-geo }}
       earthkit-meteo: ${{ steps.setup.outputs.earthkit-meteo }}
       earthkit-regrid: ${{ steps.setup.outputs.earthkit-regrid }}
       eccodes: ${{ steps.setup.outputs.eccodes }}
@@ -132,6 +136,13 @@ jobs:
             develop_branch: develop
             input: ${{ inputs.earthkit-data }}
             optional_matrix: null
+          ecmwf/earthkit-geo:
+            path: .github/ci-hpc-config.yml
+            python: true
+            master_branch: main
+            develop_branch: develop
+            input: ${{ inputs.earthkit-geo }}
+            optional_matrix: null
           ecmwf/earthkit-meteo:
             path: .github/ci-hpc-config.yml
             python: true
@@ -415,6 +426,31 @@ jobs:
           ${{ inputs.eccodes-python }}
           ${{ inputs.pyodc }}
         python_requirements: tests/downstream-ci-requirements.txt
+  earthkit-geo:
+    name: earthkit-geo
+    needs:
+    - setup
+    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-geo && (inputs.earthkit-geo) }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.setup.outputs.earthkit-geo) }}
+    env:
+      DEP_TREE: ${{ needs.setup.outputs.dep_tree }}
+    runs-on:
+    - self-hosted
+    - linux
+    - hpc
+    steps:
+    - uses: ecmwf-actions/reusable-workflows/ci-hpc@v2
+      with:
+        github_user: ${{ secrets.BUILD_PACKAGE_HPC_GITHUB_USER }}
+        github_token: ${{ secrets.GH_REPO_READ_TOKEN }}
+        troika_user: ${{ secrets.HPC_CI_SSH_USER }}
+        repository: ${{ matrix.owner_repo_ref }}
+        build_config: ${{ matrix.config_path }}
+        dependencies: ''
+        python_dependencies: ''
+        python_requirements: tests/downstream-ci-requirements.txt
   earthkit-meteo:
     name: earthkit-meteo
     needs:

diff --git a/.github/workflows/downstream-ci.yml b/.github/workflows/downstream-ci.yml
@@ -15,6 +15,9 @@ name: downstream-ci
       earthkit-data:
         required: false
         type: string
+      earthkit-geo:
+        required: false
+        type: string
       earthkit-meteo:
         required: false
         type: string
@@ -96,6 +99,7 @@ jobs:
       atlas: ${{ steps.setup.outputs.atlas }}
       cfgrib: ${{ steps.setup.outputs.cfgrib }}
       earthkit-data: ${{ steps.setup.outputs.earthkit-data }}
+      earthkit-geo: ${{ steps.setup.outputs.earthkit-geo }}
       earthkit-meteo: ${{ steps.setup.outputs.earthkit-meteo }}
       earthkit-regrid: ${{ steps.setup.outputs.earthkit-regrid }}
       eccodes: ${{ steps.setup.outputs.eccodes }}
@@ -150,6 +154,13 @@ jobs:
             develop_branch: develop
             input: ${{ inputs.earthkit-data }}
             optional_matrix: null
+          ecmwf/earthkit-geo:
+            path: ''
+            python: true
+            master_branch: main
+            develop_branch: develop
+            input: ${{ inputs.earthkit-geo }}
+            optional_matrix: null
           ecmwf/earthkit-meteo:
             path: ''
             python: true
@@ -568,6 +579,27 @@ jobs:
           python -m pytest -v -m 'notebook'
           python -m pytest --forked -vv -m 'no_cache_init'
           python -m coverage report
+  earthkit-geo:
+    name: earthkit-geo
+    needs:
+    - setup
+    - python-qa
+    if: ${{ (always() && !cancelled()) && contains(join(needs.*.result, ','), 'success') && needs.setup.outputs.earthkit-geo && (inputs.earthkit-geo) }}
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.setup.outputs.earthkit-geo) }}
+    env:
+      DEP_TREE: ${{ needs.setup.outputs.dep_tree }}
+    runs-on: ${{ matrix.labels }}
+    steps:
+    - uses: ecmwf-actions/reusable-workflows/ci-python@v2
+      with:
+        repository: ${{ matrix.owner_repo_ref }}
+        checkout: true
+        python_dependencies: ''
+        codecov_upload: ${{ needs.setup.outputs.trigger_repo == github.job && inputs.codecov_upload && needs.setup.outputs.py_codecov_platform == matrix.name }}
+        codecov_token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
+        requirements_path: tests/downstream-ci-requirements.txt
   earthkit-meteo:
     name: earthkit-meteo
     needs:
@@ -588,7 +620,6 @@ jobs:
         python_dependencies: ''
         codecov_upload: ${{ needs.setup.outputs.trigger_repo == github.job && inputs.codecov_upload && needs.setup.outputs.py_codecov_platform == matrix.name }}
         codecov_token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
-        requirements_path: tests/downstream-ci-requirements.txt
   earthkit-regrid:
     name: earthkit-regrid
     needs:

diff --git a/dependency_tree.yml b/dependency_tree.yml
@@ -32,6 +32,13 @@ earthkit-data:
       python -m pytest --forked -vv -m 'no_cache_init'
       python -m coverage report
 
+earthkit-geo:
+  type: python
+  master_branch: main
+  requirements_path: tests/downstream-ci-requirements.txt
+  downstream-ci:
+    config_path: ""
+
 earthkit-meteo:
   type: python
   master_branch: main