From 661ad3ed6c950dc69ee2e7d71ec057b6e29b0927 Mon Sep 17 00:00:00 2001
From: Ronelle Landy <rlandy@redhat.com>
Date: Tue, 4 Dec 2018 14:30:36 -0500
Subject: [PATCH] Allow dlrn_hash_tag* vars to be overridden

When running the run-v3 playbook with the reproducer
workflow, a specific dlrn_hash_tag and newest tag
need to be passed to the job. This can be done in
featureset_override - if allowed in the playbook.

Also allows for getting a ready releases.sh file to use
to ensure a static dlrn hash.

Change-Id: I6201cd62e7d314fb8b53a104563c11c28ed8f2a2
---
 roles/run-test/tasks/main.yaml                | 10 ++++++++++
 roles/run-test/templates/toci_gate_test.sh.j2 | 16 ++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/roles/run-test/tasks/main.yaml b/roles/run-test/tasks/main.yaml
index 398d33158..896881d69 100644
--- a/roles/run-test/tasks/main.yaml
+++ b/roles/run-test/tasks/main.yaml
@@ -16,6 +16,8 @@
         - 'standalone_container_cli'
         - 'test_white_regex'
         - 'tempest_workers'
+        - 'dlrn_hash_tag'
+        - 'dlrn_hash_tag_newest'
     fail:
       msg: "ERROR: {{ item }} is not overridable."
     when: item not in "{{ allowed_overrides }}"
@@ -71,6 +73,14 @@
     dest: "{{ tripleo_root }}/tripleo-ci/scripts/oooq_common_functions.sh"
     force: yes
 
+- name: render ready releases.sh file
+  copy:
+    content: "{{ ready_releases_file }}"
+    dest: "{{ workspace }}/logs/releases.sh"
+    mode: 0644
+    force: yes
+  when: ready_releases_file is defined
+
 - shell:
     cmd: |
       set -e
diff --git a/roles/run-test/templates/toci_gate_test.sh.j2 b/roles/run-test/templates/toci_gate_test.sh.j2
index 27a544de4..f8adb715e 100755
--- a/roles/run-test/templates/toci_gate_test.sh.j2
+++ b/roles/run-test/templates/toci_gate_test.sh.j2
@@ -125,12 +125,16 @@ EMIT_RELEASES_EXTRA_ARGS="$EMIT_RELEASES_EXTRA_ARGS --is-periodic"
 
 if [[ -f "$RELEASES_SCRIPT" ]] && [[ {{ featureset }} =~ 010|011|037|047|050|056 ]]; then
 
-    python $RELEASES_SCRIPT \
-        --stable-release ${STABLE_RELEASE:-"master"} \
-        --featureset-file $TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$(basename {{ job_featureset_file }}) \
-        --output-file $RELEASES_FILE_OUTPUT \
-        --log-file $RELEASES_SCRIPT_LOGFILE \
-        $EMIT_RELEASES_EXTRA_ARGS
+    if [[  -f "$RELEASES_FILE_OUTPUT" ]]; then
+       echo "Importing ready releases.sh file - skipping releases.sh file generation."
+    else
+        python $RELEASES_SCRIPT \
+            --stable-release ${STABLE_RELEASE:-"master"} \
+            --featureset-file $TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$(basename {{ job_featureset_file }}) \
+            --output-file $RELEASES_FILE_OUTPUT \
+            --log-file $RELEASES_SCRIPT_LOGFILE \
+            $EMIT_RELEASES_EXTRA_ARGS
+    fi
 fi