From 3aa40775d838a6a3c063130acd1289b8b8d0edca Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Wed, 16 Nov 2016 11:30:00 +0100
Subject: [PATCH] Fix collect/upload logs for CoreOS

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
 .travis.yml                               | 1 -
 scripts/collect-info.yaml                 | 2 +-
 tests/cloud_playbooks/upload-logs-gcs.yml | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d8ab8f16..57ef062a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -176,7 +176,6 @@ after_failure:
     -e ostype=${CLOUD_IMAGE}
     -e commit=${TRAVIS_COMMIT}
     -e dir=${HOME}
-    -e ansible_python_interpreter=${PYPATH}
 
 after_script:
   - >
diff --git a/scripts/collect-info.yaml b/scripts/collect-info.yaml
index 6501da995..eb1252d04 100644
--- a/scripts/collect-info.yaml
+++ b/scripts/collect-info.yaml
@@ -86,7 +86,7 @@
       with_items: "{{logs}}"
 
     - name: Pack results and logs
-      local_action: shell GZIP=-9 tar --remove-files -cvzf {{dir|default(".")}}/logs.tar.gz -C /tmp collect-info
+      local_action: raw GZIP=-9 tar --remove-files -cvzf {{dir|default(".")}}/logs.tar.gz -C /tmp collect-info
       run_once: true
 
     - name: Clean up collected command outputs
diff --git a/tests/cloud_playbooks/upload-logs-gcs.yml b/tests/cloud_playbooks/upload-logs-gcs.yml
index 80d651ba4..438467440 100644
--- a/tests/cloud_playbooks/upload-logs-gcs.yml
+++ b/tests/cloud_playbooks/upload-logs-gcs.yml
@@ -8,12 +8,12 @@
 
   tasks:
     - name: Generate uniq bucket name prefix
-      shell: date +%Y%m%d
+      raw: date +%Y%m%d
       register: out
 
     - name: replace_test_id
       set_fact:
-        test_name: "kargo-ci-{{ out.stdout }}"
+        test_name: "kargo-ci-{{ out.stdout_lines[0] }}"
 
     - set_fact:
         file_name: "{{ostype}}-{{kube_network_plugin}}-{{commit}}-logs.tar.gz"