Skip to content

Fix image selection for 4-digit releases

Spyros Argyropoulos requested to merge fixAthena into master

Description of bug

The release is currently extracted by removing all dots and converting to an integer. Then the cc7 image is picked if rel >= 21651 which is incorrect for the 4-digit releases 21.6.46.1 etc.

Changes introduced

Extract minor release number and use that instead

Tests

After the change I see:

INFO: generate CI config for 502xxx/502956 with release 21.6.46.1
sargyrop@MacBook-Pro-5 mcjoboptions % cat .run_athena.yml 

stages:
  - run_athena
  - check_logParser

#-----------------------------------------------------
# RUN ATHENA: CHILD JOB 502956
#-----------------------------------------------------
run_athena_502956:
  stage: run_athena
  tags:
    - cvmfs
  # image built from ASG https://gitlab.cern.ch/atlas-sit/docker/tree/master/slc6-atlasos
  image: atlas/slc6-atlasos

You might want to wait to merge until @drebuzzi has tested that it works

Issues resolved

Closes #

Edited by Spyros Argyropoulos

Merge request reports