fix #8703 and minor improv. to CI (#8708)

dmwm · Sep 20, 2024 · e8149dd · e8149dd
1 parent 319fb3b
commit e8149dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -55,16 +55,17 @@ get_env:
 
 set_version_name:
   rules:
+    - !reference [.default_rules, default]
     - !reference [.default_rules, release]
   stage: prepare_release
   image:
     name: registry.cern.ch/cmscrab/buildtools
     entrypoint: [""]
   script:
     - |
-        echo -e "\n__version__ = \"${CI_COMMIT_TAG}\" #Automatically added during build process" >> src/python/TaskWorker/__init__.py;
+        echo -e "\n__version__ = \"${CI_COMMIT_TAG}\" #Automatically added during build process\n" >> src/python/TaskWorker/__init__.py;
     - |
-        echo -e "\n__version__ = \"${CI_COMMIT_TAG}\" #Automatically added during build process" >> src/python/CRABInterface/__init__.py;
+        echo -e "\n__version__ = \"${CI_COMMIT_TAG}\" #Automatically added during build process\n" >> src/python/CRABInterface/__init__.py;
   cache:
     - key: $CI_PIPELINE_ID
       paths:

diff --git a/cicd/crabtaskworker_pypi/Dockerfile b/cicd/crabtaskworker_pypi/Dockerfile
@@ -100,7 +100,9 @@ COPY --chown=${USER}:${USER} cicd/crabtaskworker_pypi/rucio.cfg /opt/rucio/etc/
 
 # add github repos, reuse script in crabserver_pypi
 COPY --chown=${USER}:${USER} cicd/crabserver_pypi/addGH.sh ./
+USER ${USER}
 RUN bash addGH.sh
+USER root
 
 # clean up
 WORKDIR ${WDIR}