From 895aeea851d53c07109a50c7ded7e90a05a669d7 Mon Sep 17 00:00:00 2001
From: Sylvester Joosten <sjoosten@anl.gov>
Date: Thu, 30 Sep 2021 16:59:41 +0000
Subject: [PATCH] make install.py aware of material scan branch
---
install.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/install.py b/install.py
index e5b353fdf..c57b6192f 100755
--- a/install.py
+++ b/install.py
@@ -232,7 +232,11 @@ if __name__ == "__main__":
version_docker = None
version_gitlab = None
build_job = '{}:singularity:default'.format(args.container)
- if args.version in ('master', 'testing'):
+ ## firs tlook for spacialty containers
+ if args.container == 'acts_material_scan':
+ version_docker = args.version
+ version_gitlab = args.container
+ elif args.version in ('master', 'testing'):
version_docker = 'testing'
version_gitlab = 'master'
elif re.search('[0-9]+\.[0-9]+\.[0-9]|[0-9]+\.[0-9]-stable', args.version) is not None:
@@ -254,6 +258,10 @@ if __name__ == "__main__":
print('Unknown requested version:', args.version)
raise UnknownVersionError()
+ ## 'master' is always docker-tagged as testing
+ if version_docker == 'master':
+ version_docker = testing
+
## when working with the old container, the build job is just 'singularity'
if args.container == 'eic':
build_job = 'singularity'
--
GitLab