Dev 0.22

Jenkinsfile

@@ -20,20 +20,30 @@ pipeline {
                     }
                 }
                 stages {
-                    stage('Create environment') {
+                    stage('Create python environment') {
                         steps {
                             sh """
-                            python3 -m venv env
-                            source env/bin/activate
+                            python3 -m venv .venv
+                            source .venv/bin/activate
                             pip install -r requirements.txt
                             """
                         }
                     }
+                    stage('Create uenv') {
+                        steps {
+                            sh """
+                            git clone -b fix/jenkins https://github.com/eth-cscs/uenv.git
+                            ./uenv/install --yes --destdir=$WORKSPACE
+                            source $WORKSPACE/etc/profile.d/uenv.sh
+                            uenv repo create
+                            uenv image pull mch/v8:rc2
+                            """
+                        }
+                    }
                     stage('Bootstrap spack') {
                         // Bootstrapping spack is a separate stage to avoid problems with concurrently bootstrapping spack in the tests.
                         steps {
                             sh """
-                            source env/bin/activate
                             source ./setup-env.sh
                             spack spec gnuconfig
                             """
@@ -42,26 +52,28 @@ pipeline {
                     stage('Unit Tests') {
                         steps {
                             sh """
-                            source env/bin/activate
+                            source .venv/bin/activate
                             python3 test/unit_test.py
                             """
                         }
                     }
                     stage('Integration Tests') {
                         steps {
                             sh """
-                            source env/bin/activate
-                            source ./setup-env.sh /mch-environment/v7
-                            pytest -v -n auto test/integration_test.py
+                            source $WORKSPACE/etc/profile.d/uenv.sh
+                            source ./setup-env.sh /user-environment
+                            source .venv/bin/activate
+                            uenv run mch/v8:rc2 -- pytest -v -n auto test/integration_test.py
                             """
                         }
                     }
                     stage('System Tests') {
                         steps {
                             sh """
-                            source env/bin/activate
-                            source ./setup-env.sh /mch-environment/v7
-                            pytest -v -n auto test/system_test.py
+                            source $WORKSPACE/etc/profile.d/uenv.sh
+                            source ./setup-env.sh /user-environment
+                            source .venv/bin/activate
+                            uenv run mch/v8:rc2 -- pytest -v -n auto test/system_test.py
                             """
                         }
                     }

repos/c2sm/packages/cosmo-eccodes-definitions/package.py

@@ -1,25 +1,3 @@
-# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
-# Spack Project Developers. See the top-level COPYRIGHT file for details.
-#
-# SPDX-License-Identifier: (Apache-2.0 OR MIT)
-
-# ----------------------------------------------------------------------------
-# If you submit this package back to Spack as a pull request,
-# please first remove this boilerplate and all FIXME comments.
-#
-# This is a template package file for Spack.  We've put "FIXME"
-# next to all the things you'll want to change. Once you've handled
-# them, you can save this file and test your package like this:
-#
-#     spack install cosmo-eccodes-definitions
-#
-# You can edit this file again by typing:
-#
-#     spack edit cosmo-eccodes-definitions
-#
-# See the Spack documentation for more information on packaging.
-# ----------------------------------------------------------------------------
-
 from spack import *
 
 
@@ -35,22 +13,12 @@ class CosmoEccodesDefinitions(Package):
     version('2.25.0.3', tag='v2.25.0.3')
     version('2.25.0.2', tag='v2.25.0.2')
     version('2.25.0.1', tag='v2.25.0.1')
-    version('2.19.0.7', tag='v2.19.0.7')
-    version('2.19.0.6', tag='v2.19.0.6')
-    version('2.19.0.5', tag='v2.19.0.5')
-    version('2.19.0.4', tag='v2.19.0.4')
-    version('2.19.0.3', tag='v2.19.0.3')
-    version('2.19.0.2', tag='v2.19.0.2')
-    version('2.19.0.1', tag='v2.19.0.1')
     version('2.18.0.1', tag='v2.18.0.1')
 
     depends_on('eccodes')
     depends_on('[email protected]',
                type=('build', 'link', 'run'),
                when='@2.25.0.1:')
-    depends_on('[email protected]',
-               type=('build', 'link', 'run'),
-               when='@2.19.0.1:2.19.0.7')
     depends_on('[email protected]',
                type=('build', 'link', 'run'),
                when='@2.18.0.1')