[CI] Choose version of gt4py (#248)

C2SM · Jul 25, 2023 · b4e3df3 · b4e3df3
1 parent 5891182
commit b4e3df3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/jenkins/spack-PR-icon b/jenkins/spack-PR-icon
@@ -6,6 +6,10 @@ def icon_default = true
 def spack_fork = "C2SM"
 def spack_branch = "main"
 def spack_default = true
+
+def gt4py_fork = "GridTools"
+def gt4py_branch = "icon4py_20230621"
+def gt4py_default = true
 String[] triggerPhrase = env.ghprbCommentBody.split(" ")
 
 def parseTriggerPhrase(it) {
@@ -25,6 +29,12 @@ triggerPhrase.each {
         spack_default = false
     }
 }
+triggerPhrase.each {
+    if(it.contains("gt4py${repo_identifier}")) {
+        (gt4py_fork, gt4py_branch) = parseTriggerPhrase(it)
+        gt4py_default = false
+    }
+}
 
 pipeline {
     agent none
@@ -53,6 +63,7 @@ pipeline {
                             sh """
                             git clone --depth 1 --recurse-submodules --shallow-submodules -b '${spack_branch}' https://github.com/${spack_fork}/spack-c2sm.git
                             git clone --depth 1 --recurse-submodules --shallow-submodules -b '${icon_branch}' git@github.com:${icon_fork}/icon-exclaim.git
+                            git clone --depth 1 --recurse-submodules --shallow-submodules -b '${gt4py_branch}' git@github.com:${gt4py_fork}/gt4py.git
                             git clone . icon4py
                             """
                         }
@@ -62,7 +73,7 @@ pipeline {
                             sh """
                             . ./spack-c2sm/setup-env.sh
                             cd icon-exclaim
-                            spack env activate config/cscs/spack/latest/daint_dsl_main_dev
+                            spack env activate config/cscs/spack/latest/daint_dsl_dev
                             spack install -v --until build
                             """
                         }
@@ -72,7 +83,7 @@ pipeline {
                             sh """
                             . ./spack-c2sm/setup-env.sh
                             cd icon-exclaim
-                            spack env activate config/cscs/spack/latest/daint_dsl_main_dev
+                            spack env activate config/cscs/spack/latest/daint_dsl_dev
                             spack install -v --test=root
                             """
                         }

diff --git a/spack/gt4py-stable/spack.yaml b/spack/gt4py-stable/spack.yaml
@@ -1,11 +1,10 @@
 spack:
     specs:
-        - py-icon4py@main%gcc@9.3.0
-        - py-gt4py@1.1.2%gcc@9.3.0
+        - py-icon4py@main%gcc@9.3.0 ^py-gt4py@1.1.2%gcc@9.3.0
     view: false
     concretizer:
         unify: true
     develop:
         py-icon4py:
-            spec: py-icon4py@main%gcc@9.3.0
+            spec: py-icon4py@main%gcc@9.3.0 ^py-gt4py@1.1.2%gcc@9.3.0
             path: ../../