Modify rpm_repo_url condition

So far, if odl_version was not defined, we would use the latest release.
Unfortunately, ansible 'lookup' will return an empty string if the
variable does not exist and thus odl_version will always be defined:

https://github.com/ansible/ansible/issues/17329

We use ansible 'lookup' in xci to collect the values from env variables

To overcome this, we will allow a new value for odl_version in XCI:
"latest_release". This patch adapts to that new possible value

Change-Id: Ie4d76ed576ddeded130a863f847cd51cb7491456
Signed-off-by: Manuel Buil <mbuil@suse.com>

diff --git a/tasks/add_odl_zypper_repo.yml b/tasks/add_odl_zypper_repo.yml
index 2f04e576e36bfa9e295deec01457eac3044bf125..bfc8f19452fd062a0fd995c52978fdc5a1350e19 100644 (file)
--- a/tasks/add_odl_zypper_repo.yml
+++ b/tasks/add_odl_zypper_repo.yml
@@ -10,7 +10,7 @@
        auto_import_keys: yes
        disable_gpg_check: yes
        runrefresh: yes
-  when: odl_version is defined
+  when: "'latest_release' not in odl_version"
 
 - name: Add ODL zypper repo
   zypper_repository:
@@ -18,4 +18,4 @@
     name: opendaylight
     auto_import_keys: yes
     runrefresh: yes
-  when: odl_version is undefined
+  when: "'latest_release' in odl_version"

diff --git a/vars/main.yml b/vars/main.yml
index 086337b159e4f438b42efafc29e426f4ff282d29..9c50db6a70550900354c83ef3b63362fa94fd8dd 100755 (executable)
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -69,8 +69,8 @@ odl_version_dict:
 
 # URL of the .repo config to use when installing ODL from a repo
 # NB: This will only take effect when `install_method` is "rpm_repo"
-rpm_repo_url: "{% if odl_version is defined %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version_dict[odl_version] }}-devel.repo{% else %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-devel.repo{% endif %}"
-suse_rpm_repo_url: "{% if odl_version is defined %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version_dict[odl_version] }}-opensuse-devel.repo{% else %}https://download.opensuse.org/repositories/Virtualization:/NFV/openSUSE_Leap_42.3/{% endif %}"
+rpm_repo_url: "{% if 'latest_release' not in odl_version %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version_dict[odl_version] }}-devel.repo{% else %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-devel.repo{% endif %}"
+suse_rpm_repo_url: "{% if 'latest_release' not in odl_version %}https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-{{ odl_version_dict[odl_version] }}-opensuse-devel.repo{% else %}https://download.opensuse.org/repositories/Virtualization:/NFV/openSUSE_Leap_42.3/{% endif %}"
 
 # URL of the deb repository to use when installing ODL from a repo
 # NB: This will only take effect when `install_method` is "deb_repo"