Skip to content
Snippets Groups Projects
Commit 116f4e7d authored by olemorud's avatar olemorud Committed by Ole Morud
Browse files

[CI] Use root-user inside containers again

parent 81473e89
No related branches found
No related tags found
No related merge requests found
...@@ -21,7 +21,6 @@ import tarfile ...@@ -21,7 +21,6 @@ import tarfile
from hashlib import sha1 from hashlib import sha1
import openstack import openstack
import ctypes
from build_utils import ( from build_utils import (
cmake_options_from_dict, cmake_options_from_dict,
...@@ -51,14 +50,6 @@ COMPRESSIONLEVEL = 6 if not WINDOWS else 1 ...@@ -51,14 +50,6 @@ COMPRESSIONLEVEL = 6 if not WINDOWS else 1
def main(): def main():
# openstack.enable_logging(debug=True) # openstack.enable_logging(debug=True)
try:
sudo = (os.getuid() == 0)
except AttributeError:
sudo = ctypes.windll.shell32.IsUserAnAdmin() != 0
if sudo:
die(os.EX_USAGE, "Script should not be run with sudo/admin")
# accumulates commands executed so they can be displayed as a script on build failure # accumulates commands executed so they can be displayed as a script on build failure
shell_log = "" shell_log = ""
......
...@@ -255,7 +255,7 @@ jobs: ...@@ -255,7 +255,7 @@ jobs:
container: container:
image: registry.cern.ch/root-ci/${{ matrix.image }}:buildready image: registry.cern.ch/root-ci/${{ matrix.image }}:buildready
options: '--security-opt label=disable --rm --userns=keep-id' options: '--security-opt label=disable --rm'
env: env:
OS_APPLICATION_CREDENTIAL_ID: '7f5b64a265244623a3a933308569bdba' OS_APPLICATION_CREDENTIAL_ID: '7f5b64a265244623a3a933308569bdba'
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }} OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment