Move baseline png files to ert-testdata

To alleviate binary bloat in the Ert repository, the baseline png files
has been removed from ert, and added to the repository ert-testdata.

The test_screenshot workflow is configured to clone the baselines from
ert-testdata and use those for running the screenshot tests. If a change
is detected, it will pack all screenshots into an artifact.

Another workflow, running from the origin repository with sufficient
token accesses, will pick up the artifact and submit it as a new PR
to ert-testdata. Merging this PR requires manual intervention.

Author: berland

.github/workflows/build_and_test.yml

@@ -82,19 +82,6 @@ jobs:
       test-type: ${{ matrix.test-type }}
     secrets: inherit
 
-  test-screenshots:
-    needs: [run-pre-commit, check-typing]
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ '3.14' ]
-        os: [ ubuntu-latest ]
-    uses: ./.github/workflows/test_screenshots.yml
-    with:
-      os: ${{ matrix.os }}
-      python-version: ${{ matrix.python-version }}
-    secrets: inherit
-
   test-slurm:
     needs: [run-pre-commit, check-typing]
     strategy:

.github/workflows/push_screenshots.yml

@@ -1,10 +1,106 @@
 name: Push screenshots to ert-testdata
 
 on:
+  workflow_run:
+    workflows: ["Screenshot tests"]
+    types: [completed]
   workflow_dispatch:
+    inputs:
+      run-id:
+        description: 'Run ID of a Screenshot tests workflow run to use as artifact source'
+        required: true
+
+permissions:
+  contents: read
+  pull-requests: write
 
 jobs:
   push-screenshots:
+    name: Push updated screenshots to ert-testdata
     runs-on: ubuntu-latest
+    if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.event == 'pull_request'
+
     steps:
-    - run: echo "Placeholder - not yet implemented"
+    - name: Download screenshot artifact
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+      with:
+        name: screenshot-results
+        path: artifact
+        run-id: ${{ inputs.run-id || github.event.workflow_run.id }}
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Read metadata
+      id: metadata
+      run: |
+        echo "pr_number=$(jq -r '.pr_number' artifact/metadata.json)" >> "$GITHUB_OUTPUT"
+        echo "outcome=$(jq -r '.outcome' artifact/metadata.json)" >> "$GITHUB_OUTPUT"
+
+    - name: Checkout ert-testdata
+      if: steps.metadata.outputs.outcome == 'failure'
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        repository: equinor/ert-testdata
+        ref: main
+        token: ${{ secrets.ERTOMATIC_ERT_TESTDATA_TOKEN }}
+        path: ert-testdata
+
+    - name: Copy updated screenshots into ert-testdata
+      if: steps.metadata.outputs.outcome == 'failure'
+      run: cp -r artifact/updated-screenshots/. ert-testdata/screenshotbaselines/
+
+    - name: Push branch and open PR in ert-testdata
+      if: steps.metadata.outputs.outcome == 'failure'
+      env:
+        GH_TOKEN: ${{ secrets.ERTOMATIC_ERT_TESTDATA_TOKEN }}
+        PR_NUMBER: ${{ steps.metadata.outputs.pr_number }}
+      run: |
+        BRANCH="update-screenshots-ert-pr-${PR_NUMBER}"
+        cd ert-testdata
+        git config user.name "github-actions[bot]"
+        git config user.email "github-actions[bot]@users.noreply.github.com"
+        git remote set-url origin "https://x-access-token:${GH_TOKEN}@github.com/equinor/ert-testdata.git"
+        git checkout -b "$BRANCH"
+        git add --all screenshotbaselines/
+        git commit -m "Update screenshots for equinor/ert#${PR_NUMBER}"
+        git push --force origin "$BRANCH"
+        EXISTING=$(gh pr list \
+          --repo equinor/ert-testdata \
+          --head "$BRANCH" \
+          --state open \
+          --json number \
+          --jq '.[0].number // empty')
+        if [ -z "$EXISTING" ]; then
+          PR_URL=$(gh pr create \
+            --repo equinor/ert-testdata \
+            --base main \
+            --head "$BRANCH" \
+            --title "Update screenshots for equinor/ert#${PR_NUMBER}" \
+            --body "Automatically updated screenshot baselines triggered by https://github.com/equinor/ert/pull/${PR_NUMBER}")
+          if [ "${PR_NUMBER}" != "0" ]; then
+            gh pr comment "${PR_NUMBER}" \
+              --repo equinor/ert \
+              --body "Screenshots differ from baselines. A baseline update PR has been prepared: ${PR_URL}"
+          fi
+        fi
+
+    - name: Close stale ert-testdata PR if screenshots now pass
+      if: steps.metadata.outputs.outcome == 'success'
+      env:
+        GH_TOKEN: ${{ secrets.ERTOMATIC_ERT_TESTDATA_TOKEN }}
+        PR_NUMBER: ${{ steps.metadata.outputs.pr_number }}
+      run: |
+        BRANCH="update-screenshots-ert-pr-${PR_NUMBER}"
+        EXISTING=$(gh pr list \
+          --repo equinor/ert-testdata \
+          --head "$BRANCH" \
+          --state open \
+          --json number \
+          --jq '.[0].number // empty')
+        if [ -n "$EXISTING" ]; then
+          gh pr close "$EXISTING" --repo equinor/ert-testdata --delete-branch
+          if [ "${PR_NUMBER}" != "0" ]; then
+            gh pr comment "${PR_NUMBER}" \
+              --repo equinor/ert \
+              --body "Screenshot tests now pass. The baseline update PR equinor/ert-testdata#${EXISTING} has been closed."
+          fi
+        fi

.github/workflows/test_screenshots.yml

@@ -1,72 +1,67 @@
+name: Screenshot tests
+
 on:
   workflow_dispatch:
-  workflow_call:
-    inputs:
-      os:
-        type: string
-      python-version:
-        type: string
+  pull_request:
 
 permissions:
-   contents: read
+  contents: read
 
 env:
   UV_FROZEN: true
 
 jobs:
   test-screenshots:
     name: Run screenshot tests
-    timeout-minutes: 20
-    runs-on: ${{ inputs.os }}
+    timeout-minutes: 30
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
     - uses: ./.github/actions/install_dependencies_qt
       with:
-        os: ${{ inputs.os }}
+        os: ubuntu-latest
 
     - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
       id: setup_python
       with:
-        python-version: ${{ inputs.python-version }}
+        python-version: '3.14'
 
     - name: Install uv
       uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
       with:
         enable-cache: true
         prune-cache: false
-        python-version: ${{ inputs.python-version }}
+        python-version: '3.14'
 
     - name: Install ert
-      run: |
-        uv sync --group dev
+      run: uv sync --group dev
+
+    - name: Fetch screenshot baselines from ert-testdata
+      run: uv run just fetch-screenshot-baselines
 
     - name: Run screenshot tests
-      run: |
-        uv run just screenshot-comparison-test
+      id: screenshot-tests
+      run: uv run just screenshot-comparison-test
+      continue-on-error: true
 
-    - name: Pack updated screenshot in case of failure
-      if: ${{ failure() }}
+    - name: Pack updated screenshots
+      if: steps.screenshot-tests.outcome == 'failure'
+      run: uv run just pack-updated-screenshots
+
+    - name: Prepare artifact
+      if: always()
       run: |
-        uv run just pack-updated-screenshots
+        mkdir -p artifact
+        echo '{"pr_number": ${{ github.event.number || 0 }}, "outcome": "${{ steps.screenshot-tests.outcome }}"}' > artifact/metadata.json
+        if [ -d updated-screenshots ]; then
+          cp -r updated-screenshots artifact/
+        fi
 
-    - name: Upload updated screenshot images from failed image comparison test
-      id: upload-screenshot-images
-      if: ${{ failure() }}
+    - name: Upload artifact
+      if: always()
       uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-      continue-on-error: true
       with:
-        name: updated-screenshots-${{ github.run_number }}-${{ github.run_id }}-${{ inputs.python-version }}
-        path: updated-screenshots
-
-    - name: User instructions for fetching updated screenshots
-      if: ${{ failure() && steps.upload-screenshot-images.outputs.artifact-id != '' }}
-      run: |
-        echo " * Ensure gh command line utility is installed"
-        echo " * Do 'gh auth login' if you are not authenticated yet"
-        echo "$ rm -rf .tmp; gh run download ${{ github.run_id }} -D .tmp -n updated-screenshots-${{ github.run_number }}-${{ github.run_id }}-${{ inputs.python-version }}; cp -a .tmp/* ."
-        echo " * Then review your local changes and commit+squash them."
-        echo ""
-        echo "(This steps exits with a failure code in order to have its output highlighted in Github actions web interface)"
-        exit 1
+        name: screenshot-results
+        path: artifact/