From f0edf98fb3aeec720c18636a600f91f5031e9f88 Mon Sep 17 00:00:00 2001
From: Ross Brattain <ross.b.brattain@intel.com>
Date: Wed, 28 Feb 2018 07:38:05 -0800
Subject: 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>
---
 ansible/clone_repos.yml                                     | 13 -------------
 ansible/prepare_env.yml                                     |  4 ----
 ansible/roles/create_dockerfile/templates/centos/Dockerfile |  2 --
 ansible/roles/create_dockerfile/templates/ubuntu/Dockerfile |  2 --
 ansible/yardstick_config.yml                                |  1 -
 5 files changed, 22 deletions(-)

(limited to 'ansible')

diff --git a/ansible/clone_repos.yml b/ansible/clone_repos.yml
index 6f69b6b15..f35be0016 100644
--- 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 a1299c38e..321521334 100644
--- 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 ca104c8f8..96d8a0041 100644
--- 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 7fbc4f01a..6eba3a841 100644
--- 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 79ec1958e..32b853929 100644
--- 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:
-- 
cgit 1.2.3-korg