Fix containers

.github/workflows/testing.yml

@@ -38,6 +38,16 @@ jobs:
     permissions:
       packages: write
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+          android: true
+          dotnet: true
+          haskell: true
+          large-package: true
+          docker-images: true
+          swap-storage: true
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Set up QEMU
@@ -62,8 +72,8 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          target: base
           context: docker/
+          file: docker/base/Dockerfile
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -123,6 +133,10 @@ jobs:
         with:
           path: cesm/cime
           submodules: "true"
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Run tests
         shell: bash
         working-directory: cesm/cime
@@ -132,16 +146,13 @@ jobs:
           CIME_TEST_PLATFORM: "ubuntu-latest"
           SKIP_ENTRYPOINT: "true"
         run: |
-          source /opt/conda/etc/profile.d/conda.sh
-
-          conda activate cesm
-
-          mamba install -y 'python=${{ matrix.python-version }}'
-
-          pip install -r test-requirements.txt
+          uv venv
+          source .venv/bin/activate
+          uv pip install -r test-requirements.txt
 
-          # GitHub runner home is different than container
-          cp -rf /home/cime/.cime /github/home/
+          set -x
+          unset SKIP_SETUP
+          USER_ID=`id -u` GROUP_ID=`id -g` SKIP_COMMAND="true" source /entrypoint.sh
 
           pytest -vvv --cov=CIME --cov-branch --cov-report=xml --machine docker CIME/tests/test_unit*
       - name: Upload coverage reports to Codecov
@@ -214,39 +225,33 @@ jobs:
         with:
           path: /home/cime/inputdata
           key: inputdata-2
+      - name: Install uv
+        uses: astral-sh/setup-uv@v6
+        with:
+          python-version: 3.12
       - name: Run tests
         shell: bash
         working-directory: ${{ matrix.model.name }}/cime
         env:
           CIME_MODEL: ${{ matrix.model.name }}
           CIME_DRIVER: ${{ matrix.driver }}
           CIME_TEST_PLATFORM: ubuntu-latest
-          SKIP_ENTRYPOINT: "true"
+          SKIP_SETUP: "true"
         run: |
-          source /opt/conda/etc/profile.d/conda.sh
-
-          conda activate ${{ matrix.model.name }}
-
-          pip install -r test-requirements.txt
-
-          source /entrypoint.sh
-
-          if [[ "${{ matrix.model.name }}" == "e3sm" ]]; then
-            fix_mct_makefiles ../externals/mct
-          fi
-
-          # GitHub runner home is different than container
-          cp -rf /home/cime/.cime /github/home/
-
-          if [[ "${CIME_MODEL}" == "e3sm" ]]; then
-            ln -sf /github/home/.cime/config_machines.v2.xml /github/home/.cime/config_machines.xml
-          else
-            ln -sf /github/home/.cime/config_machines.v3.xml /github/home/.cime/config_machines.xml
-          fi
+          set -x
+          unset SKIP_SETUP
+          USER_ID=`id -u` GROUP_ID=`id -g` SKIP_COMMAND="true" source /entrypoint.sh
 
+          # Required for testing that uses case git feature
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@users.noreply.github.com"
 
+          source /opt/spack-environment/activate.sh
+
+          uv venv
+          source .venv/bin/activate
+          uv pip install -r test-requirements.txt
+
           pytest -vvv --cov=CIME --cov-branch --cov-report=xml --machine docker --no-fortran-run --no-teardown CIME/tests/test_sys*
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4

.gitignore

@@ -8,6 +8,11 @@ _build/
 dist/
 .coverage
 
+# Ignore env directories
+.venv
+.env
+.spack-env
+
 # Ignore emacs backup files
 *~