remove releng from Dockerfile and elsewhere

Current CI does openrc fetching before starting
the Docker container and then passes openrc
via Docker mount

JIRA: YARDSTICK-691

Change-Id: Id0649130f48db5a5586149b237c5252b953e57be
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

diff --git a/ansible/clone_repos.yml b/ansible/clone_repos.yml
index 6f69b6b..f35be00 100644 (file)
--- a/ansible/clone_repos.yml
+++ b/ansible/clone_repos.yml
@@ -17,21 +17,8 @@
     YARDSTICK_REPO: "{{ lookup('env', 'YARDSTICK_REPO')|default('https://gerrit.opnfv.org/gerrit/yardstick', true) }}"
     YARDSTICK_REPO_DIR: "{{ lookup('env', 'YARDSTICK_REPO_DIR')|default('/home/opnfv/repos/yardstick', true) }}"
     YARDSTICK_BRANCH: "{{ lookup('env', 'YARDSTICK_BRANCH')|default('master', true) }}"
-    RELENG_REPO: "{{ lookup('env', 'RELENG_REPO')|default('https://gerrit.opnfv.org/gerrit/releng', true) }}"
-    RELENG_REPO_DIR: "{{ lookup('env', 'RELENG_REPO_DIR')|default('/home/opnfv/repos/releng', true) }}"
-    RELENG_BRANCH: "{{ lookup('env', 'RELENG_BRANCH')|default('master', true) }}"
-
 
   tasks:
-    - name: Updating releng -> "{{ RELENG_BRANCH }}"
-      git:
-        repo: "{{ RELENG_REPO }}"
-        dest: "{{ RELENG_REPO_DIR }}"
-        version: "{{ RELENG_BRANCH }}"
-        accept_hostkey: yes
-        recursive: no
-        force: yes
-
     - name: Updating yardstick -> "{{ YARDSTICK_BRANCH }}"
       git:
         repo: "{{ YARDSTICK_REPO }}"

diff --git a/ansible/prepare_env.yml b/ansible/prepare_env.yml
index a1299c3..3215213 100644 (file)
--- a/ansible/prepare_env.yml
+++ b/ansible/prepare_env.yml
@@ -28,10 +28,6 @@
     - fail: msg="{{ INSTALLER_TYPE }} not in {{ INSTALLERS }}"
       when: not openrc_present and (INSTALLER_TYPE not in INSTALLERS)
 
-    - name: fetch OS credentials
-      command: "{{ RELENG_REPO_DIR }}/utils/fetch_os_creds.sh {{ '-v' if DEPLOY_TYPE == 'virt' else '' }} -d {{ OPENRC }} -i {{ INSTALLER_TYPE }} -a {{ INSTALLER_IP }}"
-      when: not openrc_present
-
 
   roles:
     - role: convert_openrc

diff --git a/ansible/roles/create_dockerfile/templates/centos/Dockerfile b/ansible/roles/create_dockerfile/templates/centos/Dockerfile
index ca104c8..96d8a00 100644 (file)
--- a/ansible/roles/create_dockerfile/templates/centos/Dockerfile
+++ b/ansible/roles/create_dockerfile/templates/centos/Dockerfile
@@ -18,7 +18,6 @@ ENV REPOS_DIR /home/opnfv/repos
 
 # Yardstick repo
 ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick
-ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
 
 RUN yum -y install\
     deltarpm \
@@ -50,7 +49,6 @@ RUN yum -y install\
 RUN mkdir -p ${REPOS_DIR} && \
     git config --global http.sslVerify false && \
     git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR}  && \
-    git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
 
 # install yardstick + dependencies
 # explicity pin pip version to avoid future issues like the ill-fated pip 8.0.0 release

diff --git a/ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile b/ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile
index 7fbc4f0..6eba3a8 100644 (file)
--- a/ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile
+++ b/ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile
@@ -18,7 +18,6 @@ ENV REPOS_DIR /home/opnfv/repos
 
 # Yardstick repo
 ENV YARDSTICK_REPO_DIR ${REPOS_DIR}/yardstick
-ENV RELENG_REPO_DIR ${REPOS_DIR}/releng
 RUN sed -i -e 's/^deb /deb [arch=amd64] /g;s/^deb-src /# deb-src /g' /etc/apt/sources.list && \
     echo "\n\
 deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty main universe multiverse restricted \n\
@@ -63,7 +62,6 @@ RUN apt-get update && apt-get install -y \
 RUN mkdir -p ${REPOS_DIR} && \
     git config --global http.sslVerify false && \
     git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR}  && \
-    git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
 
 # install yardstick + dependencies
 # explicity pin pip version to avoid future issues like the ill-fated pip 8.0.0 release

diff --git a/ansible/yardstick_config.yml b/ansible/yardstick_config.yml
index 79ec195..32b8539 100644 (file)
--- a/ansible/yardstick_config.yml
+++ b/ansible/yardstick_config.yml
@@ -21,7 +21,6 @@ OPENRC: "{{ opnfv_root }}/openrc"
 INSTALLERS: [apex, compass, fuel, joid]
 INSTALLER_TYPE: "{{ lookup('env', 'INSTALLER_TYPE') }}"
 YARDSTICK_REPO_DIR: "{{ lookup('env', 'YARDSTICK_REPO_DIR')|default('/home/opnfv/repos/yardstick', true) }}"
-RELENG_REPO_DIR: "{{ lookup('env', 'RELENG_REPO_DIR')|default('/home/opnfv/repos/releng', true) }}"
 storperf_rc: "{{ opnfv_root }}/storperf_admin-rc"
 
 DISPATCHER_TYPES:

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 46e52d5..959315c 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,7 +21,6 @@ ENV REPOS_DIR="/home/opnfv/repos" \
 
 # Yardstick repo
 ENV YARDSTICK_REPO_DIR="${REPOS_DIR}/yardstick" \
-    RELENG_REPO_DIR="${REPOS_DIR}/releng" \
     STORPERF_REPO_DIR="${REPOS_DIR}/storperf"
 
 RUN apt-get update && apt-get install -y git python-setuptools python-pip && apt-get -y autoremove && apt-get clean
@@ -32,7 +31,6 @@ RUN mkdir -p ${REPOS_DIR}
 
 RUN git config --global http.sslVerify false
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/yardstick ${YARDSTICK_REPO_DIR}
-RUN git clone --depth 1 https://gerrit.opnfv.org/gerrit/releng ${RELENG_REPO_DIR}
 RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/storperf ${STORPERF_REPO_DIR}
 
 WORKDIR ${YARDSTICK_REPO_DIR}

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index caef8ac..37b72b3 100755 (executable)
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -28,34 +28,12 @@ OPENRC=/etc/yardstick/openstack.creds
 INSTALLERS=(apex compass fuel joid)
 
 RC_VAR_EXIST=false
-if [ "${OS_AUTH_URL}" -a "${OS_USERNAME}" -a "${OS_PASSWORD}" -a "${EXTERNAL_NETWORK}" ];then
+if [[ "${OS_AUTH_URL}" && "${OS_USERNAME}" && "${OS_PASSWORD}" && "${EXTERNAL_NETWORK}" ]];then
     RC_VAR_EXIST=true
 fi
 
-if [ "${RC_VAR_EXIST}" = false ]; then
-    if [ ! -f $OPENRC ];then
-        # credentials file is not given, check if environment variables are set
-        # to get the creds using fetch_os_creds.sh later on
-        echo "INFO: Checking environment variables INSTALLER_TYPE and INSTALLER_IP"
-        if [ -z ${INSTALLER_TYPE} ]; then
-            echo "environment variable 'INSTALLER_TYPE' is not defined."
-            exit 1
-        elif [[ ${INSTALLERS[@]} =~ ${INSTALLER_TYPE} ]]; then
-            echo "INSTALLER_TYPE env variable found: ${INSTALLER_TYPE}"
-        else
-            echo "Invalid env variable INSTALLER_TYPE=${INSTALLER_TYPE}"
-            exit 1
-        fi
-
-        if [ "$DEPLOY_TYPE" == "virt" ]; then
-            FETCH_CRED_ARG="-v -d $OPENRC -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}"
-        else
-            FETCH_CRED_ARG="-d $OPENRC -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}"
-        fi
-
-        $RELENG_REPO_DIR/utils/fetch_os_creds.sh $FETCH_CRED_ARG
-    fi
-    source $OPENRC
+if [[ "${RC_VAR_EXIST}" = false && -f ${OPENRC} ]]; then
+    . ${OPENRC}
 fi
 
 export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME