Merge changes I68779792,Ide8d210e
authorFatih Degirmenci <fdegir@gmail.com>
Mon, 12 Feb 2018 07:49:18 +0000 (07:49 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 12 Feb 2018 07:49:18 +0000 (07:49 +0000)
commit37980c29656ff34ae0fa8b0bf14ad876382778b3
tree6e561b66282949535213735b859fd621fc975550
parent30eb16fb6d7f16bc05258298eeef78732bdd9cf0
parent9dc51f765444a912266e5f5ea86a8a25c18d0dda
Merge changes I68779792,Ide8d210e

* changes:
  Export CI_LOOP as expected by Functest
  Export an new var related to Energy in functest jobs