From e273d9c5d44857f227f70d6e906eae3051bb65bc Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Tue, 12 Mar 2019 23:01:38 +0100
Subject: [PATCH] Fix unit tests after changing branches too eagerly
Commit 108fb9184332 was a bit too eager in changing the branch names and also
changed the ones in the unit tests, breaking them since the reference files
weren't update accordingly.
Revert those changes so that unit tests pass again.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
atc_renderer/tests_files/test_file1.yaml | 2 +-
atc_renderer/tests_files/test_file4.yaml | 2 +-
atc_renderer/tests_files/test_file5.yaml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/atc_renderer/tests_files/test_file1.yaml b/atc_renderer/tests_files/test_file1.yaml
index 725cf89b..3fb99fa3 100644
--- a/atc_renderer/tests_files/test_file1.yaml
+++ b/atc_renderer/tests_files/test_file1.yaml
@@ -59,7 +59,7 @@ metadata:
install:
git-repos:
- url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
- branch: 'apertis/v2019dev0'
+ branch: master
run:
steps:
diff --git a/atc_renderer/tests_files/test_file4.yaml b/atc_renderer/tests_files/test_file4.yaml
index 4cc07a1e..ffa7684c 100644
--- a/atc_renderer/tests_files/test_file4.yaml
+++ b/atc_renderer/tests_files/test_file4.yaml
@@ -36,7 +36,7 @@ metadata:
install:
git-repos:
- url: https://gitlab.apertis.org/tests/apparmor.git
- branch: 'apertis/v2019dev0'
+ branch: master
run:
steps:
diff --git a/atc_renderer/tests_files/test_file5.yaml b/atc_renderer/tests_files/test_file5.yaml
index a7b1e112..ee09751c 100644
--- a/atc_renderer/tests_files/test_file5.yaml
+++ b/atc_renderer/tests_files/test_file5.yaml
@@ -37,7 +37,7 @@ install:
- chown user:user -R /tmp/ribchester-*
git-repos:
- url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
- branch: 'apertis/v2019dev0'
+ branch: master
run:
steps:
--
GitLab