Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Johnfreeman/allow test externals #17

Merged
merged 3 commits into from
Oct 26, 2023
Merged

Johnfreeman/allow test externals #17

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3047740
JCF: provide option to select a test-tag for an externals image, as w…
jcfreeman2 Oct 26, 2023
a000dc6
JCF: fix some syntax errors
jcfreeman2 Oct 26, 2023
6633778
JCF: at least for the time being, continue using Pengfei's area for t…
jcfreeman2 Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 45 additions & 28 deletions .github/workflows/slim_externals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ on:
- cron: "30 1 * * *"

workflow_dispatch:
inputs:
tag-suffix:
description: 'optional suffix for test-only externals image (e.g., T would mean alma9-slim-externals:v2.0T)'
default: ''
account-to-copy:
description: 'the user account whose docker-scratch/cvmfs_dunedaq area you want to copy (default dingpf)'
default: 'dingpf'

jobs:

Expand All @@ -15,6 +22,11 @@ jobs:
packages: write
contents: read
steps:
- name: Intro
run: |
echo "Will create a ghcr.io/dune-daq/sl7-slim-externals:v1.1${{ github.event.inputs.tag-suffix }} image"
echo "Image contents will include $HOSTNAME:/home/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq/spack/externals/ext-v1.1"

- name: Log in to the Container registry
uses: docker/login-action@v2
with:
Expand All @@ -29,16 +41,16 @@ jobs:
images: |
ghcr.io/dune-daq/sl7-slim-externals
tags: |
type=raw,value=v1.1-initial
type=raw,value=v1.1${{ github.event.inputs.tag-suffix }}-initial

- name: prepare build dir
id: prep_build_dir
run: |
build_dir="/home/dingpf/docker-scratch/cvmfs_dunedaq"
build_dir="/home/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq"
cd $build_dir
refresh_date=$(date +%y-%m-%d)
echo "FROM ghcr.io/dune-daq/sl7-spack:latest" > Dockerfile
echo 'MAINTAINER Pengfei Ding "dingpf@fnal.gov"' >> Dockerfile
echo 'MAINTAINER John Freeman "jcfree@fnal.gov"' >> Dockerfile
echo "ENV REFRESHED_AT $refresh_date" >> Dockerfile
echo "ADD spack/externals/ext-v1.1 /cvmfs/dunedaq.opensciencegrid.org/spack/externals/ext-v1.1" >> Dockerfile
echo "RUN source /cvmfs/dunedaq.opensciencegrid.org/spack/externals/ext-v1.1/spack-0.20.0-gcc-12.1.0/spack-0.20.0/share/spack/setup-env.sh && spack uninstall -y llvm" >> Dockerfile
Expand All @@ -50,7 +62,7 @@ jobs:
- name: Build and push Docker images
uses: docker/build-push-action@v3
with:
context: /home/dingpf/docker-scratch/cvmfs_dunedaq
context: /home/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand All @@ -59,7 +71,7 @@ jobs:
if: always()
run: |

rm -f /home/dingpf/docker-scratch/cvmfs_dunedaq/Dockerfile
rm -f /home/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq/Dockerfile
docker image prune -f
docker container prune -f
docker network prune -f
Expand Down Expand Up @@ -87,7 +99,7 @@ jobs:
images: |
ghcr.io/dune-daq/sl7-slim-externals
tags: |
type=raw,value=v1.1
type=raw,value=v1.1${{ github.event.inputs.tag-suffix }}

- name: prepare build dir
run: |
Expand All @@ -96,12 +108,12 @@ jobs:
cd $build_dir
refresh_date=$(date +%y-%m-%d)
echo "FROM ghcr.io/dune-daq/sl7-spack:latest" > Dockerfile
echo 'MAINTAINER Pengfei Ding "dingpf@fnal.gov"' >> Dockerfile
echo 'MAINTAINER John Freeman "jcfree@fnal.gov"' >> Dockerfile
echo "ENV REFRESHED_AT $refresh_date" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1-initial /cvmfs/dunedaq.opensciencegrid.org/spack /cvmfs/dunedaq.opensciencegrid.org/spack" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1-initial /cvmfs/dunedaq.opensciencegrid.org/tools /cvmfs/dunedaq.opensciencegrid.org/tools" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1-initial /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1-initial /cvmfs/dunedaq.opensciencegrid.org/pypi-repo /cvmfs/dunedaq.opensciencegrid.org/pypi-repo" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/spack /cvmfs/dunedaq.opensciencegrid.org/spack" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/tools /cvmfs/dunedaq.opensciencegrid.org/tools" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/pypi-repo /cvmfs/dunedaq.opensciencegrid.org/pypi-repo" >> Dockerfile
echo 'ENTRYPOINT ["/bin/bash"]' >> Dockerfile

- name: Build and push Docker images
Expand Down Expand Up @@ -134,7 +146,7 @@ jobs:
images: |
ghcr.io/dune-daq/c8-slim-externals
tags: |
type=raw,value=v1.1
type=raw,value=v1.1${{ github.event.inputs.tag-suffix }}

- name: prepare build dir
run: |
Expand All @@ -143,12 +155,12 @@ jobs:
cd $build_dir
refresh_date=$(date +%y-%m-%d)
echo "FROM ghcr.io/dune-daq/c8-spack:latest" > Dockerfile
echo 'MAINTAINER Pengfei Ding "dingpf@fnal.gov"' >> Dockerfile
echo 'MAINTAINER John Freeman "jcfree@fnal.gov"' >> Dockerfile
echo "ENV REFRESHED_AT $refresh_date" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1-initial /cvmfs/dunedaq.opensciencegrid.org/spack /cvmfs/dunedaq.opensciencegrid.org/spack" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1-initial /cvmfs/dunedaq.opensciencegrid.org/tools /cvmfs/dunedaq.opensciencegrid.org/tools" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1-initial /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1-initial /cvmfs/dunedaq.opensciencegrid.org/pypi-repo /cvmfs/dunedaq.opensciencegrid.org/pypi-repo" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/spack /cvmfs/dunedaq.opensciencegrid.org/spack" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/tools /cvmfs/dunedaq.opensciencegrid.org/tools" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/sl7-slim-externals:v1.1${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/pypi-repo /cvmfs/dunedaq.opensciencegrid.org/pypi-repo" >> Dockerfile
echo 'ENTRYPOINT ["/bin/bash"]' >> Dockerfile

- name: Build and push Docker images
Expand All @@ -166,6 +178,11 @@ jobs:
packages: write
contents: read
steps:
- name: Intro
run: |
echo "Will create a ghcr.io/dune-daq/alma9-slim-externals:v2.0${{ github.event.inputs.tag-suffix }} image"
echo "Image contents will include $HOSTNAME:/home/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq/spack/externals/ext-v2.0"

- name: Log in to the Container registry
uses: docker/login-action@v2
with:
Expand All @@ -180,16 +197,16 @@ jobs:
images: |
ghcr.io/dune-daq/alma9-slim-externals
tags: |
type=raw,value=v2.0-initial
type=raw,value=v2.0${{ github.event.inputs.tag-suffix }}-initial

- name: prepare build dir
id: prep_build_dir
run: |
build_dir="/home/dingpf/docker-scratch/cvmfs_dunedaq"
build_dir="/home/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq"
cd $build_dir
refresh_date=$(date +%y-%m-%d)
echo "FROM ghcr.io/dune-daq/alma9-spack:latest" > Dockerfile
echo 'MAINTAINER Pengfei Ding "dingpf@fnal.gov"' >> Dockerfile
echo 'MAINTAINER John Freeman "jcfree@fnal.gov"' >> Dockerfile
echo "ENV REFRESHED_AT $refresh_date" >> Dockerfile
echo "ADD spack/externals/ext-v2.0 /cvmfs/dunedaq.opensciencegrid.org/spack/externals/ext-v2.0" >> Dockerfile
echo "RUN source /cvmfs/dunedaq.opensciencegrid.org/spack/externals/ext-v2.0/spack-0.20.0-gcc-12.1.0/spack-0.20.0/share/spack/setup-env.sh && spack uninstall -y llvm" >> Dockerfile
Expand All @@ -201,7 +218,7 @@ jobs:
- name: Build and push Docker images
uses: docker/build-push-action@v3
with:
context: /home/dingpf/docker-scratch/cvmfs_dunedaq
context: /home/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
Expand All @@ -210,7 +227,7 @@ jobs:
if: always()
run: |

rm -f /home/dingpf/docker-scratch/cvmfs_dunedaq/Dockerfile
rm -f /home/${{ github.event.inputs.account-to-copy }}/docker-scratch/cvmfs_dunedaq/Dockerfile
docker image prune -f
docker container prune -f
docker network prune -f
Expand Down Expand Up @@ -238,7 +255,7 @@ jobs:
images: |
ghcr.io/dune-daq/alma9-slim-externals
tags: |
type=raw,value=v2.0
type=raw,value=v2.0${{ github.event.inputs.tag-suffix }}

- name: prepare build dir
run: |
Expand All @@ -247,12 +264,12 @@ jobs:
cd $build_dir
refresh_date=$(date +%y-%m-%d)
echo "FROM ghcr.io/dune-daq/alma9-spack:latest" > Dockerfile
echo 'MAINTAINER Pengfei Ding "dingpf@fnal.gov"' >> Dockerfile
echo 'MAINTAINER John Freeman "jcfree@fnal.gov"' >> Dockerfile
echo "ENV REFRESHED_AT $refresh_date" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.0-initial /cvmfs/dunedaq.opensciencegrid.org/spack /cvmfs/dunedaq.opensciencegrid.org/spack" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.0-initial /cvmfs/dunedaq.opensciencegrid.org/tools /cvmfs/dunedaq.opensciencegrid.org/tools" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.0-initial /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.0-initial /cvmfs/dunedaq.opensciencegrid.org/pypi-repo /cvmfs/dunedaq.opensciencegrid.org/pypi-repo" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.0${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/spack /cvmfs/dunedaq.opensciencegrid.org/spack" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.0${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/tools /cvmfs/dunedaq.opensciencegrid.org/tools" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.0${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh /cvmfs/dunedaq.opensciencegrid.org/setup_dunedaq.sh" >> Dockerfile
echo "COPY --from=ghcr.io/dune-daq/alma9-slim-externals:v2.0${{ github.event.inputs.tag-suffix }}-initial /cvmfs/dunedaq.opensciencegrid.org/pypi-repo /cvmfs/dunedaq.opensciencegrid.org/pypi-repo" >> Dockerfile
echo 'ENTRYPOINT ["/bin/bash"]' >> Dockerfile

- name: Build and push Docker images
Expand Down