Skip to content
Snippets Groups Projects

make install.py aware of material scan branch

Merged Sylvester Joosten requested to merge support_matscan into master
1 file
+ 9
1
Compare changes
  • Side-by-side
  • Inline
+ 9
1
@@ -232,7 +232,11 @@ if __name__ == "__main__":
@@ -232,7 +232,11 @@ if __name__ == "__main__":
version_docker = None
version_docker = None
version_gitlab = None
version_gitlab = None
build_job = '{}:singularity:default'.format(args.container)
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_docker = 'testing'
version_gitlab = 'master'
version_gitlab = 'master'
elif re.search('[0-9]+\.[0-9]+\.[0-9]|[0-9]+\.[0-9]-stable', args.version) is not None:
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__":
@@ -254,6 +258,10 @@ if __name__ == "__main__":
print('Unknown requested version:', args.version)
print('Unknown requested version:', args.version)
raise UnknownVersionError()
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'
## when working with the old container, the build job is just 'singularity'
if args.container == 'eic':
if args.container == 'eic':
build_job = 'singularity'
build_job = 'singularity'
Loading