Make slurm take into account environment correctly

bash-setup/templates/ldap/ldif/add_CE_firstce.ldif

@@ -5,7 +5,7 @@ maxjobs: 3000
 maxqueuedjobs: 300
 matcharg: CPUCORES=1
 cerequirements:other.cpucores>=1
-submitarg: "-c 1"
+submitarg: --export-file=/home/submituser/slurm-environment.config -c 1
 name: firstce
 objectclass: AliEnCE
 objectclass: top

bash-setup/templates/ldap/ldif/add_CE_secondce.ldif

@@ -2,9 +2,10 @@ dn: name=secondce,ou=CE,ou=Services,ou=JTestSite,ou=Sites,o=localhost,dc=localdo
 host: secondhost.localdomain
 installmethod: CVMFS
 maxjobs: 3000
-cerequirements:other.cpucores>=4
-submitarg: "-c 4"
-matcharg: CPUCORES=4
+environment: proxy_cache_file=/data/secondhost/proxy
+environment: SLURM_LOG_PATH=/data/secondhost/log
+submitarg: --export-file=/home/submituser/slurm-environment.config -c 4
+matcharg: CPUCORES=0
 maxqueuedjobs: 300
 name: secondce
 objectclass: AliEnCE

ce-setup/ce-entrypoint.sh

@@ -15,7 +15,6 @@ echo "submituser:toor" | chpasswd
 service munge start
 
 cp $HOST_CONFIG/slurm-environment-$1.config /home/submituser/slurm-environment.config
-export SUBMIT_ARGS="--export-file=/home/submituser/slurm-environment.config"
 [ ! -e /home/submituser/tmp ] && su submituser -c "mkdir -p /home/submituser/tmp /home/submituser/logs"
 
 #run CE with auto reloading

ce-setup/slurm-conf/slurm.conf

@@ -26,6 +26,7 @@ ProctrackType=proctrack/linuxproc
 CacheGroups=0
 #FirstJobId=
 ReturnToService=0
+TaskPlugin=task/affinity,task/cgroup
 #MaxJobCount=
 #PlugStackConfig=
 #PropagatePrioProcess=
@@ -57,7 +58,7 @@ SchedulerType=sched/backfill
 #SchedulerPort=
 #SchedulerRootFilter=
 SelectType=select/cons_res
-SelectTypeParameters=CR_CPU_Memory
+SelectTypeParameters=CR_CPU
 FastSchedule=1
 #PriorityType=priority/multifactor
 #PriorityDecayHalfLife=14-0
@@ -88,7 +89,7 @@ AccountingStorageLoc=slurm_acct_db
 #AccountingStorageUser=
 #
 # COMPUTE NODES
-NodeName=c[1-2] CPUs=8 RealMemory=1000 State=UNKNOWN
+NodeName=c[1-2] CPUs=8 RealMemory=4000 State=UNKNOWN
 #
 # PARTITIONS
-PartitionName=normal Default=yes Nodes=c[1-2] Priority=50 DefMemPerCPU=500 Shared=NO MaxNodes=1 MaxTime=5-00:00:00 DefaultTime=5-00:00:00 State=UP
+PartitionName=normal Default=yes Nodes=c[1-2] Priority=50 DefMemPerCPU=1 Shared=NO MaxNodes=1 MaxTime=5-00:00:00 DefaultTime=5-00:00:00 State=UP