diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-04-06 05:20:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-06 05:20:27 +0000 |
| commit | 5f0c83e1fedbd02252049c6753669da5c7670dde (patch) | |
| tree | ba9b5f92016bb22abfd611bbd5a1d4be6b95c072 /prototypes | |
| parent | 65b1aa43850a1154a9153a2bf7b3271f46ca0d5d (diff) | |
| parent | d1378b9f3d570d07af5a8f08144070059105373f (diff) | |
Merge "xci: Introduce XCI_LOOP variable to control what to do properly"
Diffstat (limited to 'prototypes')
| -rwxr-xr-x | prototypes/xci/config/env-vars | 1 | ||||
| -rw-r--r-- | prototypes/xci/playbooks/configure-opnfvhost.yml | 2 | ||||
| -rw-r--r-- | prototypes/xci/var/opnfv.yml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/prototypes/xci/config/env-vars b/prototypes/xci/config/env-vars index 052be2ace..cefb412a6 100755 --- a/prototypes/xci/config/env-vars +++ b/prototypes/xci/config/env-vars @@ -9,6 +9,7 @@ export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy export CLEAN_DIB_IMAGES=false export OPNFV_HOST_IP=192.168.122.2 export XCI_FLAVOR_ANSIBLE_FILE_PATH=$OPNFV_RELENG_PATH/prototypes/xci/file/$XCI_FLAVOR +export CI_LOOP=${CI_LOOP:-daily} export JOB_NAME=${JOB_NAME:-false} # TODO: this currently matches to bifrost ansible version # there is perhaps better way to do this diff --git a/prototypes/xci/playbooks/configure-opnfvhost.yml b/prototypes/xci/playbooks/configure-opnfvhost.yml index 06e27e7fc..8c794c422 100644 --- a/prototypes/xci/playbooks/configure-opnfvhost.yml +++ b/prototypes/xci/playbooks/configure-opnfvhost.yml @@ -54,8 +54,10 @@ replace: '\1haproxy_state: enabled' - name: copy OPNFV OpenStack playbook shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/prototypes/xci/file/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks" + # Copy pinned role requirements if we are running as part of daily CI loop - name: copy OPNFV role requirements shell: "/bin/cp -rf {{OPNFV_RELENG_PATH}}/prototypes/xci/file/ansible-role-requirements.yml {{OPENSTACK_OSA_PATH}}" + when: XCI_LOOP == "daily" - hosts: localhost remote_user: root tasks: diff --git a/prototypes/xci/var/opnfv.yml b/prototypes/xci/var/opnfv.yml index dd3761bd1..12cb55675 100644 --- a/prototypes/xci/var/opnfv.yml +++ b/prototypes/xci/var/opnfv.yml @@ -20,5 +20,6 @@ OPENSTACK_OSA_ETC_PATH: "{{ lookup('env','OPENSTACK_OSA_ETC_PATH') }}" XCI_ANSIBLE_PIP_VERSION: "{{ lookup('env','XCI_ANSIBLE_PIP_VERSION') }}" XCI_FLAVOR: "{{ lookup('env','XCI_FLAVOR') }}" XCI_FLAVOR_ANSIBLE_FILE_PATH: "{{ lookup('env','XCI_FLAVOR_ANSIBLE_FILE_PATH') }}" +XCI_LOOP: "{{ lookup('env','XCI_LOOP') }}" LOG_PATH: "{{ lookup('env','LOG_PATH') }}" OPNFV_HOST_IP: "{{ lookup('env','OPNFV_HOST_IP') }}" |