From b8b4be41b226550361f26dbbcbb049827f21e953 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Tue, 10 Nov 2020 17:39:08 +0100
Subject: [PATCH 1/3] add support for specifying alternate cvmfs-config package
 to install via $INPUT_CVMFS_CONFIG_PACKAGE

---
 setup-cvmfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup-cvmfs.sh b/setup-cvmfs.sh
index 2319820..be1134b 100755
--- a/setup-cvmfs.sh
+++ b/setup-cvmfs.sh
@@ -4,7 +4,7 @@
 wget -q https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb
 sudo dpkg -i cvmfs-release-latest_all.deb
 sudo apt-get -q update
-sudo apt-get -q -y install cvmfs cvmfs-config-default
+sudo apt-get -q -y install cvmfs ${INPUT_CVMFS_CONFIG_PACKAGE:-cvmfs-config-default}
 rm -f cvmfs-release-latest_all.deb
 
 # Setup default.local

From cb06267342511b4b6e9fa2251df2ab2297e4fe6e Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Tue, 10 Nov 2020 20:51:32 +0100
Subject: [PATCH 2/3] add cvmfs_config_package as known input variable

---
 README.md  | 1 +
 action.yml | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 9b33e18..8f17279 100644
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ jobs:
 The following parameters are supported:
 - `cvmfs_repositories` (optional, defaults to `atlas.cern.ch,atlas-condb.cern.ch,grid.cern.ch`): the list of repositories to load.
 - `cvmfs_http_proxy` (optional, defaults to `DIRECT`): the http proxy to use with cvmfs.
+- `cvmfs_config_package` (optional, defaults to `cvmfs-config-default`): URL to cvmfs config package to install
 
 ## Minimal Example
 
diff --git a/action.yml b/action.yml
index 13d0dad..2567f0e 100644
--- a/action.yml
+++ b/action.yml
@@ -12,6 +12,10 @@ inputs:
     description: 'Proxy for cvmfs repositories'
     required: false
     default: 'DIRECT'
+  cvmfs_config_package:
+    description: 'URL of cvmfs config package to install'
+    required: false
+    default: 'cvmfs-config-default'
 runs:
   using: "composite"
   steps: 

From 0e3485287ccefc3b5b5903d0a65b49d6a1acbfc8 Mon Sep 17 00:00:00 2001
From: Kenneth Hoste <kenneth.hoste@ugent.be>
Date: Tue, 10 Nov 2020 21:06:33 +0100
Subject: [PATCH 3/3] add test workflow for cvmfs_config_package input

---
 .github/workflows/cvmfs_config_package.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .github/workflows/cvmfs_config_package.yml

diff --git a/.github/workflows/cvmfs_config_package.yml b/.github/workflows/cvmfs_config_package.yml
new file mode 100644
index 0000000..1bcf289
--- /dev/null
+++ b/.github/workflows/cvmfs_config_package.yml
@@ -0,0 +1,13 @@
+name: Test setup-cvmfs action (with cvmfs_config_package)
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: cvmfs-contrib/github-action-cvmfs@main
+      with:
+        cvmfs_repositories: 'pilot.eessi-hpc.org'
+        cvmfs_config_package: 'https://github.com/EESSI/filesystem-layer/releases/download/v0.2.3/cvmfs-config-eessi_0.2.3_all.deb'
+    - name: Setup CernVM-FS
+      run: cat /etc/cvmfs/default.local && ls /cvmfs/pilot.eessi-hpc.org && cvmfs_config showconfig pilot.eessi-hpc.org