From bf485c5db15997221aa9ad1950ae44fe4d18e65f Mon Sep 17 00:00:00 2001
From: Frederic Lepied <flepied@redhat.com>
Date: Thu, 8 Jun 2023 19:08:46 +0200
Subject: [PATCH] allow to test changes from nfv-example-cnf-deploy

---
 testpmd/hooks/install.yml |  2 +-
 testpmd/hooks/pre-run.yml | 42 +++++++++++++++++++++++++++------------
 testpmd/hooks/tests.yml   |  2 +-
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/testpmd/hooks/install.yml b/testpmd/hooks/install.yml
index 613db2e..ef0259f 100644
--- a/testpmd/hooks/install.yml
+++ b/testpmd/hooks/install.yml
@@ -1,7 +1,7 @@
 ---
 - name: Deploy the Example CNF applications
   include_role:
-    name: "{{ dci_config_dir }}/hooks/{{ cluster_name }}/nfv-example-cnf-deploy/roles/example-cnf-app"
+    name: "{{ deploy_dir }}/roles/example-cnf-app"
 
 - name: Apply configuration for CNF Cert Suite execution
   include_role:
diff --git a/testpmd/hooks/pre-run.yml b/testpmd/hooks/pre-run.yml
index 4ed417d..57dc309 100644
--- a/testpmd/hooks/pre-run.yml
+++ b/testpmd/hooks/pre-run.yml
@@ -19,7 +19,7 @@
   with_items: "{{ hostvars.localhost.job_info.job.components }}"
   when: item["type"] == "nfv-example-cnf-index"
 
-- name: Check change presence
+- name: Check example-cnf change presence
   block:
     - name: Check if example-cnf is part of the change
       stat:
@@ -28,7 +28,7 @@
 
     - block:
         - name: Generate versions
-          shell: "./generate-versions.sh {{ job_logs.path }}/versions.cfg pr$(jq -r .number ../example-cnf-[0-9]*.json).$(jq -r .head.sha ../example-cnf-[0-9]*.json|cut -c1-8)"
+          shell: 'JSON=$(ls ../example-cnf-[0-9]*.json); if [ -z "$JSON" ]; then JSON=../github.json; fi; ./generate-versions.sh {{ job_logs.path }}/versions.cfg pr$(jq -r .number $JSON).$(jq -r .head.sha $JSON|cut -c1-8)'
           args:
             chdir: "{{ dci_change_dir }}/example-cnf"
 
@@ -59,6 +59,16 @@
 #             state: absent
 
       when: examplecnf_change_dir.stat.exists and examplecnf_change_dir.stat.isdir
+
+      - name: Check if nfv-example-cnf-deploy is part of the change
+        stat:
+          path: "{{ dci_change_dir }}/nfv-example-cnf-deploy"
+        register: deploy_change_dir
+
+      - name: Override the deploy_dir variable
+        set_fact:
+          deploy_dir: "{{ dci_change_dir }}/nfv-example-cnf-deploy"
+        when: deploy_change_dir.stat.exists and deploy_change_dir.stat.isdir
   when:
     - dci_change_dir is defined
 
@@ -153,16 +163,6 @@
   ignore_errors: true
   no_log: true
 
-- name: Checkout Example CNF deployment role
-  git:
-    repo: "https://github.com/rh-nfv-int/nfv-example-cnf-deploy.git"
-    dest: "{{ dci_config_dir }}/hooks/{{ cluster_name }}/nfv-example-cnf-deploy"
-    version: "{{ example_cnf_deploy_script_version|default('master') }}"
-    update: yes
-  register: gitresult
-
-- debug: msg="Git hash is {{ gitresult.after }}"
-
 - name: "Install required rpm packages"
   package:
     name:
@@ -174,6 +174,22 @@
     state: latest
   become: true
 
+- name: Override the deploy_dir variable
+  set_fact:
+    deploy_dir: "{{ dci_config_dir }}/hooks/{{ cluster_name }}/nfv-example-cnf-deploy"
+  when:
+    - deploy_dir is not defined
+
+- name: Checkout Example CNF deployment role
+  git:
+    repo: "https://github.com/rh-nfv-int/nfv-example-cnf-deploy.git"
+    dest: "{{ deploy_dir }}"
+    version: "{{ example_cnf_deploy_script_version|default('master') }}"
+    update: yes
+  register: gitresult
+
+- debug: msg="Git hash is {{ gitresult.after }}"
+
 - name: Mirror catalog in disconnected environment
   include_tasks: mirror-catalog.yml
   when:
@@ -181,6 +197,6 @@
 
 - name: Deploy NFV Example CNF catalog
   include_role:
-    name: "{{ dci_config_dir }}/hooks/{{ cluster_name }}/nfv-example-cnf-deploy/roles/example-cnf-catalog"
+    name: "{{ deploy_dir }}/roles/example-cnf-catalog"
 
 ...
diff --git a/testpmd/hooks/tests.yml b/testpmd/hooks/tests.yml
index 888a81c..75c3752 100644
--- a/testpmd/hooks/tests.yml
+++ b/testpmd/hooks/tests.yml
@@ -1,7 +1,7 @@
 ---
 - name: Run migration test
   include_role:
-    name: "{{ dci_config_dir }}/hooks/{{ cluster_name }}/nfv-example-cnf-deploy/roles/example-cnf-validate"
+    name: "{{ deploy_dir }}/roles/example-cnf-validate"
   when:
     - run_migration_test|default(true)|bool