run dev-env with root inside container

Change-Id: Ib474b10d42081fa9a3b3975cc427749541f68f56

Author: Andrey-mp

README.md

@@ -131,16 +131,16 @@ sudo docker exec -it tf-dev-sandbox bash
 ``` bash
 cd ~/tf-dev-env
 make sync                # get latest code
-sudo make setup dep      # set up docker container and install build dependencies
+make setup dep      # set up docker container and install build dependencies
 make fetch_packages      # pull third_party dependencies
 ```
 
 The descriptions of targets:
 
 - `make sync` - sync code in `./contrail` directory using `repo` tool
 - `make fetch_packages` - pull `./third_party` dependencies (after code checkout)
-- `sudo make setup` - initial configuration of image (required to run once)
-- `sudo make dep` - installs all build dependencies
+- `make setup` - initial configuration of image (required to run once)
+- `make dep` - installs all build dependencies
 - `make dep-<pkg_name>` - installs build dependencies for <pkg_name>
 
 ### 4. Building artifacts

Vagrantfile

@@ -4,8 +4,7 @@
 VAGRANTFILE_API_VERSION = "2"
 USER = "root"
 GROUP = "root"
-DEVENV_USER="root"
-HOME_DIR = "/#{DEVENV_USER}"
+HOME_DIR = "/root"
 DEV_ENV_DIR = "#{HOME_DIR}/tf-dev-env"
 REPOS_DIR = "#{HOME_DIR}/src/review.opencontrail.org/Juniper/"
 

common/common.sh

@@ -8,6 +8,7 @@ set -o errexit
 export DEBUGINFO=${DEBUGINFO:-FALSE}
 
 # working environment
+# WORKSPACE and two next vars are appcable only outside of sandbox container - on host.
 export WORKSPACE=${WORKSPACE:-$(pwd)}
 export TF_CONFIG_DIR=${TF_CONFIG_DIR:-"${HOME}/.tf"}
 export TF_DEVENV_PROFILE="${TF_CONFIG_DIR}/dev.env"
@@ -25,16 +26,16 @@ else
 fi
 
 # working build directories
+# CONTRAIL_DIR is useful only outside of sandbox container
 if [ -z "${CONTRAIL_DIR+x}" ] ; then
   # not defined => use default
-  CONTRAIL_DIR=${WORKSPACE}/contrail 
+  CONTRAIL_DIR=${WORKSPACE}/contrail
 elif [ -z "$CONTRAIL_DIR" ] ; then
   # defined empty => dont bind contrail dir to host: tf jenkins
-  CONTRAIL_DIR=${WORKSPACE}/contrail 
+  CONTRAIL_DIR=${WORKSPACE}/contrail
   BIND_CONTRAIL_DIR=false
 fi
 export CONTRAIL_DIR
-export DEVENV_USER=${DEVENV_USER:-$(id -nu)}
 
 # build environment preparation options
 export CONTAINER_REGISTRY=${CONTAINER_REGISTRY:-"localhost:5000"}

common/tf_functions.sh

@@ -16,7 +16,7 @@ export DEBUG=${DEBUG}
 export DEBUGINFO=${DEBUGINFO}
 export LINUX_DISTR=${LINUX_DISTR}
 export LINUX_DISTR_VER=${LINUX_DISTR_VER}
-export DEV_ENV_ROOT=/${DEVENV_USER}/tf-dev-env
+export DEV_ENV_ROOT=/root/tf-dev-env
 export DEVENV_TAG=$DEVENV_TAG
 export CONTRAIL_BUILD_FROM_SOURCE=${CONTRAIL_BUILD_FROM_SOURCE}
 export OPENSTACK_VERSIONS=${OPENSTACK_VERSIONS}
@@ -62,13 +62,14 @@ EOF
 function prepare_infra()
 {
   echo "INFO: create symlinks to work directories with artifacts  $(date)"
-  mkdir -p $HOME/work
+  mkdir -p $HOME/work /root/contrail
+  # /root/contrail will be defined later as REPODIR
   for folder in ${work_folders[@]} ; do
     [[ -e $WORK_DIR/$folder ]] || mkdir $WORK_DIR/$folder
-    [[ -e $CONTRAIL_DIR/$folder ]] || ln -s $WORK_DIR/$folder $CONTRAIL_DIR/$folder
+    [[ -e /root/contrail/$folder ]] || ln -s $WORK_DIR/$folder /root/contrail/$folder
   done
   for file in ${work_files[@]} ; do
     touch $WORK_DIR/$file
-    [[ -e $CONTRAIL_DIR/$file ]] || ln -s $WORK_DIR/$file $CONTRAIL_DIR/$file
+    [[ -e /root/contrail/$file ]] || ln -s $WORK_DIR/$file /root/contrail/$file
   done
 }

container/Dockerfile.centos

@@ -4,13 +4,8 @@ ARG LC_ALL=en_US.UTF-8
 ARG LANG=en_US.UTF-8
 ARG LANGUAGE=en_US.UTF-8
 
-ARG DEVENV_USER=root
-ARG DEVENV_UID=0
-ARG DEVENV_GROUP=""
-ARG DEVENV_GID=""
-
-ENV USER $DEVENV_USER
-ENV HOME /$DEVENV_USER
+ENV USER root
+ENV HOME /root
 ENV CONTRAIL $HOME/contrail
 ENV LC_ALL=$LC_ALL
 ENV LANG=$LANG
@@ -36,19 +31,10 @@ RUN if ! yum info jq ; then yum -y install epel-release ; fi && \
     yum clean all && \
     rm -rf /var/cache/yum && \
     pip3 install --retries=10 --timeout 200 --upgrade tox setuptools lxml jinja2 && \
-    rm -f /usr/local/bin/virtualenv && \
-    if [[ "$DEVENV_USER" != 'root' ]] ; then \
-        groupadd --gid $DEVENV_GID $DEVENV_GROUP && \
-        useradd -md $HOME --uid $DEVENV_UID --gid $DEVENV_GID $DEVENV_USER && \
-        echo '%wheel        ALL=(ALL)       NOPASSWD: ALL' >> /etc/sudoers && \
-        usermod -aG wheel $DEVENV_USER && \
-        chown -R $DEVENV_UID:$DEVENV_GID $HOME || exit 1; \
-    fi
+    rm -f /usr/local/bin/virtualenv
 
 ADD entrypoint.sh /
 
-USER $DEVENV_USER
-
 RUN echo export CONTRAIL=$CONTRAIL >> $HOME/.bashrc && \
     echo export LD_LIBRARY_PATH=$CONTRAIL/build/lib >> $HOME/.bashrc
 

container/Dockerfile.rhel7

@@ -5,13 +5,9 @@ ARG LANG=en_US.UTF-8
 ARG LANGUAGE=en_US.UTF-8
 
 ARG ENABLE_RHSM_REPOS=false
-ARG DEVENV_USER=root
-ARG DEVENV_UID=0
-ARG DEVENV_GROUP=""
-ARG DEVENV_GID=""
 
-ENV USER $DEVENV_USER
-ENV HOME /$DEVENV_USER
+ENV USER root
+ENV HOME /root
 ENV CONTRAIL $HOME/contrail
 ENV LC_ALL=$LC_ALL
 ENV LANG=$LANG
@@ -43,19 +39,10 @@ RUN if [[ "$ENABLE_RHSM_REPOS" == 'true' ]] ; then \
     yum clean all && \
     rm -rf /var/cache/yum && \
     pip3 install --retries=10 --timeout 200 --upgrade tox setuptools lxml jinja2 && \
-    rm -f /usr/local/bin/virtualenv && \
-    if [[ "$DEVENV_USER" != 'root' ]] ; then \
-        groupadd --gid $DEVENV_GID $DEVENV_GROUP && \
-        useradd -md $HOME --uid $DEVENV_UID --gid $DEVENV_GID $DEVENV_USER && \
-        echo '%wheel        ALL=(ALL)       NOPASSWD: ALL' >> /etc/sudoers && \
-        usermod -aG wheel $DEVENV_USER && \
-        chown -R $DEVENV_UID:$DEVENV_GID $HOME || exit 1; \
-    fi
+    rm -f /usr/local/bin/virtualenv
 
 ADD entrypoint.sh /
 
-USER $DEVENV_USER
-
 RUN echo export CONTRAIL=$CONTRAIL >> $HOME/.bashrc && \
     echo export LD_LIBRARY_PATH=$CONTRAIL/build/lib >> $HOME/.bashrc
 

container/build.sh

@@ -22,10 +22,6 @@ echo "Building tf-dev-env image: ${DEVENV_IMAGE}" | tee $logfile
 
 build_opts="--build-arg LC_ALL=en_US.UTF-8 --build-arg LANG=en_US.UTF-8 --build-arg LANGUAGE=en_US.UTF-8"
 build_opts+=" --network host --no-cache --tag ${DEVENV_IMAGE} --tag ${CONTAINER_REGISTRY}/${DEVENV_IMAGE} -f Dockerfile.${LINUX_DISTR} ."
-if [[ -n "$DEVENV_USER" && "$DEVENV_USER" != 'root' ]] ; then
-    build_opts+=" --build-arg DEVENV_USER=$DEVENV_USER --build-arg DEVENV_UID=$(id -u)"
-    build_opts+=" --build-arg DEVENV_GROUP=$(id -ng) --build-arg DEVENV_GID=$(id -g)"
-fi
 
 if [[ "$ENABLE_RHSM_REPOS" == 'true' ]] ; then
     build_opts+=" --build-arg ENABLE_RHSM_REPOS=$ENABLE_RHSM_REPOS"

container/run.sh

@@ -31,23 +31,23 @@ function fetch() {
 
 function configure() {
     echo "INFO: make setup  $(date)"
-    sudo make setup
+    make setup
 
     echo "INFO: make dep fetch_packages  $(date)"
     # targets can use yum and will block each other. don't run them in parallel
-    sudo make dep 
+    make dep 
     make fetch_packages
 
     # disable byte compiling
     if [[ ! -f /usr/lib/rpm/brp-python-bytecompile.org  ]] ; then
         echo "INFO: disable byte compiling for python"
-        sudo mv /usr/lib/rpm/brp-python-bytecompile /usr/lib/rpm/brp-python-bytecompile.org
-        cat <<EOF | sudo tee /usr/lib/rpm/brp-python-bytecompile
+        mv /usr/lib/rpm/brp-python-bytecompile /usr/lib/rpm/brp-python-bytecompile.org
+        cat <<EOF | tee /usr/lib/rpm/brp-python-bytecompile
 #!/bin/bash
 # disabled byte compiling
 exit 0
 EOF
-        sudo chmod +x /usr/lib/rpm/brp-python-bytecompile
+        chmod +x /usr/lib/rpm/brp-python-bytecompile
     fi
 }
 

run.sh

@@ -26,9 +26,9 @@ SITE_MIRROR=${SITE_MIRROR:-}
 if [[ "$stage" == 'upload' ]]; then
   # Pushes devenv (or potentially other containers) to external registry
   echo "INFO: pushing devenv to container registry"
-  sudo docker stop ${DEVENV_CONTAINER_NAME}
-  sudo docker commit ${DEVENV_CONTAINER_NAME} ${CONTAINER_REGISTRY}/${DEVENV_IMAGE_NAME}:${DEVENV_PUSH_TAG}
-  sudo docker push ${CONTAINER_REGISTRY}/${DEVENV_IMAGE_NAME}:${DEVENV_PUSH_TAG}
+  mysudo docker stop ${DEVENV_CONTAINER_NAME}
+  mysudo docker commit ${DEVENV_CONTAINER_NAME} ${CONTAINER_REGISTRY}/${DEVENV_IMAGE_NAME}:${DEVENV_PUSH_TAG}
+  mysudo docker push ${CONTAINER_REGISTRY}/${DEVENV_IMAGE_NAME}:${DEVENV_PUSH_TAG}
   exit 0
 fi
 
@@ -89,13 +89,13 @@ if ! is_container_created "$DEVENV_CONTAINER_NAME"; then
   if [[ $DISTRO != "macosx" ]]; then
       volumes+=" -v /etc/localtime:/etc/localtime"
   fi
-  volumes+=" -v ${scriptdir}:/$DEVENV_USER/tf-dev-env:${DOCKER_VOLUME_OPTIONS}"
+  volumes+=" -v ${scriptdir}:/root/tf-dev-env:${DOCKER_VOLUME_OPTIONS}"
   if [[ "$BIND_CONTRAIL_DIR" != 'false' ]] ; then
     # make dir to create them under current user
     mkdir -p ${CONTRAIL_DIR}
-    volumes+=" -v ${CONTRAIL_DIR}:/$DEVENV_USER/contrail:${DOCKER_VOLUME_OPTIONS}"
+    volumes+=" -v ${CONTRAIL_DIR}:/root/contrail:${DOCKER_VOLUME_OPTIONS}"
   elif [[ -n "$CONTRAIL_BUILD_FROM_SOURCE" && -n "${src_volume_name}" ]] ; then
-    volumes+=" -v ${src_volume_name}:/$DEVENV_USER/contrail:${DOCKER_VOLUME_OPTIONS}"
+    volumes+=" -v ${src_volume_name}:/root/contrail:${DOCKER_VOLUME_OPTIONS}"
   fi
   # make dir to create them under current user
   mkdir -p ${WORKSPACE}/output
@@ -108,7 +108,7 @@ if ! is_container_created "$DEVENV_CONTAINER_NAME"; then
   #  - TF Jenkins CI use non-bind folder for sources
   start_sandbox_cmd="mysudo docker run --network host --privileged --detach \
     --name $DEVENV_CONTAINER_NAME \
-    -w /$DEVENV_USER ${options} \
+    -w /root ${options} \
     $volumes -it \
     ${CONTAINER_REGISTRY}/${DEVENV_IMAGE}"
 
@@ -135,7 +135,7 @@ if [[ "$stage" == 'none' ]] ; then
 fi
 
 echo "run stage $stage with target $target"
-mysudo docker exec -i $DEVENV_CONTAINER_NAME /$DEVENV_USER/tf-dev-env/container/run.sh $stage $target | tee -a ${log_path}
+mysudo docker exec -i $DEVENV_CONTAINER_NAME /root/tf-dev-env/container/run.sh $stage $target | tee -a ${log_path}
 result=${PIPESTATUS[0]}
 
 if [[ $result == 0 ]] ; then

scripts/build-tpp.sh

@@ -35,16 +35,16 @@ pushd ${tpp_dir}/upstream/rpm
 echo "INFO: tpp: make list"
 make list
 echo "INFO: tpp: make prep"
-sudo make prep
+make prep
 echo "INFO: tpp: make all"
-sudo make all
+make all
 popd
 
 if [[ ! -e /etc/yum.repos.d/contrail.repo ]] ; then
     echo "INFO: enable contrail repo for next compilation steps"
     # enable contrail repo for dev-env if not created
     # (it is for tpp to be available during compile stage)
-    cat <<EOF | sudo tee /etc/yum.repos.d/contrail.repo
+    cat <<EOF | tee /etc/yum.repos.d/contrail.repo
 [contrail]
 name = Contrail repo
 baseurl = ${CONTRAIL_REPOSITORY}

scripts/controller_ut/run-tests.py

@@ -119,7 +119,6 @@ def _parse_junit_xml(self, xml_path):
         soup = etree.fromstring(xml_doc)
 
         status = TestResult.SUCCESS
-        test_suites = []
         suite_objs = []
 
         # check if the root tag is testsuite, and if not, find
@@ -237,7 +236,7 @@ def generate_test_report(self, scons_rc, final_result):
 
 SCons targets executed:
 {% for target in scons_targets %}
-	{{ target }}
+    {{ target }}
 {% endfor %}
 SCons Result:		{{ scons_rc }}
 Analyzer Result:	{{ final_result }}
@@ -292,6 +291,7 @@ def generate_test_report(self, scons_rc, final_result):
             print(e)
         print(text)
 
+
 def main():
     runner = TungstenTestRunner()
     runner.parse_arguments()
@@ -320,8 +320,8 @@ def main():
         if result == TestResult.SUCCESS:
             break
 
-        logging.warning("Test Failure, {} targets failed:\n".format(len(failed_targets))
-                        + "\n\t".join(failed_targets))
+        logging.warning("Test Failure, {} targets failed:\n".format(len(failed_targets)) +
+                        "\n\t".join(failed_targets))
         logging.info("Retrying, %d attempts remaining.", counter)
 
     runner.generate_test_report(rc, "SUCCESS" if result == TestResult.SUCCESS else "FAILURE")

scripts/controller_ut/run-tests.sh

@@ -13,8 +13,8 @@ mkdir -p "$logs_path"
 # contrail code assumes this in tests, since it uses socket.fqdn(..) but expects the result
 # to be 'localhost' when for CentOS it would return 'localhost.localdomain'
 # see e.g.: https://github.com/Juniper/contrail-analytics/blob/b488e3cd608643ae5dd1e0dcbc03c9e8768178ce/contrail-opserver/alarmgen.py#L872
-sudo bash -c 'echo "127.0.0.1 localhost" > /etc/hosts'
-sudo bash -c 'echo "::1 localhost" >> /etc/hosts'
+bash -c 'echo "127.0.0.1 localhost" > /etc/hosts'
+bash -c 'echo "::1 localhost" >> /etc/hosts'
 
 unset BUILD_ONLY
 

scripts/run-tests.sh

@@ -10,7 +10,7 @@ export JOBS=${JOBS:-$(nproc)}
 scriptdir=$(realpath $(dirname "$0"))
 
 if [[ -n "$CONTRAIL_CONFIG_DIR" && -d "$CONTRAIL_CONFIG_DIR" ]]; then
-  sudo cp -rf ${CONTRAIL_CONFIG_DIR}/* /
+  cp -rf ${CONTRAIL_CONFIG_DIR}/* /
 fi
 
 if [[ "$TARGET" == 'ui' ]]; then