From 9b1ff59e9e5c679b2330bbcdda9f6ade74995b8d Mon Sep 17 00:00:00 2001 From: Andrei Stepanov Date: Nov 09 2018 17:12:53 +0000 Subject: Make CI check container privileged Signed-off-by: Andrei Stepanov --- diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index b936c44..f910a0f 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -21,6 +21,7 @@ pipeline { containerTemplate { name 'tester' image DOCKER_REPO_URL + '/' + openshiftProject + '/str-tester:' + STABLE_LABEL + privileged true ttyEnabled true command 'cat' } @@ -67,11 +68,6 @@ pipeline { sh ''' set -efux source "$PWD/jenv" - cp -f /etc/passwd "$HOME" - echo "osci:x:$(id -u):$(id -g):OSCI team:${HOME}:/bin/bash" >> $HOME/passwd - export LD_PRELOAD=libnss_wrapper.so - export NSS_WRAPPER_PASSWD=$HOME/passwd - export NSS_WRAPPER_GROUP=/etc/group env git config --global user.email "ci@lists.fedoraproject.org" git config --global user.name "OSCI team" @@ -107,9 +103,6 @@ pipeline { steps { sh ''' set -efux - export LD_PRELOAD=libnss_wrapper.so - export NSS_WRAPPER_PASSWD=$HOME/passwd - export NSS_WRAPPER_GROUP=/etc/group wget 'https://src.fedoraproject.org/rpms/standard-test-roles/raw/master/f/standard-test-roles.spec' # Take hash for merged branch COMMIT_HASH="$(git log --pretty=format:%h -n 1 HEAD^2)" @@ -119,10 +112,6 @@ pipeline { ARC_PREFIX="$(basename "$SOURCE0" ".${ARC_FORMAT}")/" GIT_DIR=./.git/ git archive --format="$ARC_FORMAT" --prefix "$ARC_PREFIX" -o "$SOURCE0" -v master ls -l "$SOURCE0" - export GROUP="$(id -g)" - export USER="$(id -u)" - chown "$USER"."$GROUP" "$SOURCE0" - chown "$USER"."$GROUP" standard-test-roles.spec rpmbuild --undefine="dist" --define="_sourcedir $PWD" --define="%_srcrpmdir $PWD" -bs standard-test-roles.spec ''' }