From cc2109f8dcda46219819de2d857db493cf3db70a Mon Sep 17 00:00:00 2001
From: Luis Araujo <luis.araujo@collabora.co.uk>
Date: Sat, 15 Dec 2018 00:57:48 +0800
Subject: [PATCH] Update remaining test cases for LAVA integration

This commit updates the remaining tests cases for LAVA
integration.

The change consists in adding the `git-repos` directive so they
can fetch the tests scripts from LAVA.

Signed-off-by: Luis Araujo <luis.araujo@collabora.co.uk>
---
 test-cases/apparmor-folks.yaml               | 41 +++++++++++---------
 test-cases/apparmor-functional-demo.yaml     | 21 ++++++----
 test-cases/apparmor-geoclue.yaml             | 17 +++++---
 test-cases/apparmor-tracker.yaml             | 27 +++++++------
 test-cases/apparmor-utils.yaml               | 11 ++++--
 test-cases/check-tiny-system-containers.yaml | 19 +++++----
 test-cases/check-tiny-user-containers.yaml   | 21 ++++++----
 test-cases/sanity-check.yaml                 |  7 ++++
 8 files changed, 103 insertions(+), 61 deletions(-)

diff --git a/test-cases/apparmor-folks.yaml b/test-cases/apparmor-folks.yaml
index a1b0812..3d9a388 100644
--- a/test-cases/apparmor-folks.yaml
+++ b/test-cases/apparmor-folks.yaml
@@ -35,27 +35,32 @@ metadata:
 
 install:
   deps:
-  - apparmor
-  - apparmor-profiles
-  - busybox
-  - chaiwala-apparmor-profiles
-  - apertis-tests-apparmor-report
-  - chaiwala-tests
-  - evolution-data-server
-  - folks-tools
-  - syncevolution
-  - python3
-  - telepathy-mission-control-5
-  - telepathy-gabble
-  - libfolks-eds25
-  - libfolks-telepathy25
+    - apparmor
+    - apparmor-profiles
+    - busybox
+    - chaiwala-apparmor-profiles
+    - apertis-tests-apparmor-report
+    - chaiwala-tests
+    - evolution-data-server
+    - folks-tools
+    - syncevolution
+    - python3
+    - telepathy-mission-control-5
+    - telepathy-gabble
+    - libfolks-eds25
+    - libfolks-telepathy25
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - echo -n | sudo tee /var/log/audit/audit.log
-  - common/run-test-in-systemd --name=run-test-folks --timeout=300 apparmor/folks/test-folks
-  - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
+    - "# Enter test directory:"
+    - cd apertis-tests
+    - "# Execute the following commands:"
+    - echo -n | sudo tee /var/log/audit/audit.log
+    - common/run-test-in-systemd --name=run-test-folks --timeout=300 apparmor/folks/test-folks
+    - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
 
 parse:
   pattern: ^(?P<test_case_id>.+)\.expected:\s*(?P<result>PASS|pass|FAIL|fail|SKIP|skip|UNKNOWN|unknown)$
diff --git a/test-cases/apparmor-functional-demo.yaml b/test-cases/apparmor-functional-demo.yaml
index 7de07e1..38f3626 100644
--- a/test-cases/apparmor-functional-demo.yaml
+++ b/test-cases/apparmor-functional-demo.yaml
@@ -24,17 +24,22 @@ metadata:
 
 install:
   deps:
-  - bash
-  - apparmor-demo
-  - busybox
-  - apertis-tests-apparmor-report
+    - bash
+    - apparmor-demo
+    - busybox
+    - apertis-tests-apparmor-report
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - echo -n | sudo tee /var/log/audit/audit.log
-  - common/run-test-in-systemd --name=run-lava_run_tests --timeout=90 /usr/lib/apparmor-demo/lava_run_tests
-  - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
+    - "# Enter test directory:"
+    - cd apertis-tests
+    - "# Execute the following commands:"
+    - echo -n | sudo tee /var/log/audit/audit.log
+    - common/run-test-in-systemd --name=run-lava_run_tests --timeout=90 /usr/lib/apparmor-demo/lava_run_tests
+    - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
 
 parse:
   fixupdict:
diff --git a/test-cases/apparmor-geoclue.yaml b/test-cases/apparmor-geoclue.yaml
index c4477c6..8ec588f 100644
--- a/test-cases/apparmor-geoclue.yaml
+++ b/test-cases/apparmor-geoclue.yaml
@@ -24,15 +24,20 @@ metadata:
 
 install:
   deps:
-  - busybox
-  - apertis-tests-apparmor-geoclue
+    - busybox
+    - apertis-tests-apparmor-geoclue
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - echo -n | sudo tee /var/log/audit/audit.log
-  - common/run-test-in-systemd --name run-test-geoclue --timeout 90 /usr/lib/apertis-tests/apparmor/geoclue/test-geoclue
-  - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
+    - "# Enter test directory:"
+    - cd apertis-tests
+    - "# Execute the following commands:"
+    - echo -n | sudo tee /var/log/audit/audit.log
+    - common/run-test-in-systemd --name run-test-geoclue --timeout 90 /usr/lib/apertis-tests/apparmor/geoclue/test-geoclue
+    - sudo cat /var/log/audit/audit.log | aa_log_extract_tokens.pl PERMITTING REJECTING
 
 parse:
   pattern: ^(?P<test_case_id>[\w\-\.]+):\s(?P<result>PASS|pass|FAIL|fail|SKIP|skip|UNKNOWN|unknown)$
diff --git a/test-cases/apparmor-tracker.yaml b/test-cases/apparmor-tracker.yaml
index a136177..01c5191 100644
--- a/test-cases/apparmor-tracker.yaml
+++ b/test-cases/apparmor-tracker.yaml
@@ -35,21 +35,26 @@ metadata:
 
 install:
   deps:
-  - busybox
-  - apertis-tests-apparmor-report
-  - apertis-tests-apparmor-tracker
-  - gir1.2-grilo-0.2
-  - gir1.2-tracker-1.0
-  - python3
-  - python3-gi
-  - wget
+    - busybox
+    - apertis-tests-apparmor-report
+    - apertis-tests-apparmor-tracker
+    - gir1.2-grilo-0.2
+    - gir1.2-tracker-1.0
+    - python3
+    - python3-gi
+    - wget
   steps:
-  - wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
-  - mkdir -p /home/shared/
-  - tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
+    - wget https://people.collabora.com/~araujo/apertis-test-media.tar.bz2
+    - mkdir -p /home/shared/
+    - tar -jxvf apertis-test-media.tar.bz2 -C /home/shared/
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following commands:"
     - echo -n | sudo tee /var/log/audit/audit.log
     - common/run-test-in-systemd --name run-test-tracker --timeout 3000 apparmor/tracker/test-tracker
diff --git a/test-cases/apparmor-utils.yaml b/test-cases/apparmor-utils.yaml
index 020f41c..646f7db 100644
--- a/test-cases/apparmor-utils.yaml
+++ b/test-cases/apparmor-utils.yaml
@@ -37,12 +37,17 @@ metadata:
 
 install:
   deps:
-  - apparmor-utils-tests
-  - busybox
-  - apertis-tests-apparmor-report
+    - apparmor-utils-tests
+    - busybox
+    - apertis-tests-apparmor-report
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
 
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Run the the following commands:"
     - echo -n | sudo tee /var/log/audit/audit.log
     - 'common/run-test-in-systemd --name=aa-enforce-test --timeout 90 -- sh /usr/lib/apparmor-utils-tests/aa-enforce-test.sh'
diff --git a/test-cases/check-tiny-system-containers.yaml b/test-cases/check-tiny-system-containers.yaml
index 68d5461..8a8a443 100644
--- a/test-cases/check-tiny-system-containers.yaml
+++ b/test-cases/check-tiny-system-containers.yaml
@@ -15,16 +15,21 @@ metadata:
 
 install:
   deps:
-  - libpam-cgfs
-  - lxc
-  - lxc-templates
-  - uidmap
+    - libpam-cgfs
+    - lxc
+    - lxc-templates
+    - uidmap
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/tiny-image-recipes.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - sed s/__NAMESPACE_PLACEHOLDER__/lxc-apertis-tiny-system/g lxc/lxc-tiny-connectivity-profile-template | apparmor_parser -qr
-  - lavatests/check-tiny-containers -a "$ARCH" -r "$RELEASE" -d "$IMAGE_DATE" -t lxc/lxc-tiny-connectivity --aa-namespace "lxc-apertis-tiny-system"
+    - "# Enter test directory:"
+    - cd tiny-image-recipes
+    - "# Execute the following commands:"
+    - sed s/__NAMESPACE_PLACEHOLDER__/lxc-apertis-tiny-system/g lxc/lxc-tiny-connectivity-profile-template | apparmor_parser -qr
+    - lavatests/check-tiny-containers -a "$ARCH" -r "$RELEASE" -d "$IMAGE_DATE" -t lxc/lxc-tiny-connectivity --aa-namespace "lxc-apertis-tiny-system"
 
 parse:
   pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))"
diff --git a/test-cases/check-tiny-user-containers.yaml b/test-cases/check-tiny-user-containers.yaml
index ea30e34..cc92aff 100644
--- a/test-cases/check-tiny-user-containers.yaml
+++ b/test-cases/check-tiny-user-containers.yaml
@@ -15,17 +15,22 @@ metadata:
 
 install:
   deps:
-  - libpam-cgfs
-  - lxc
-  - lxc-templates
-  - uidmap
+    - libpam-cgfs
+    - lxc
+    - lxc-templates
+    - uidmap
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/tiny-image-recipes.git
+      branch: master
 
 run:
   steps:
-  - "# Execute the following commands:"
-  - sysctl -w kernel.unprivileged_userns_clone=1
-  - sed s/__NAMESPACE_PLACEHOLDER__/lxc-apertis-tiny-userns/g lxc/lxc-tiny-connectivity-profile-template | apparmor_parser -qr
-  - sudo -u user -H lavatests/check-tiny-containers -a "$ARCH" -r "$RELEASE" -d "$IMAGE_DATE" -t lxc/lxc-tiny-connectivity --aa-namespace "lxc-apertis-tiny-userns"
+    - "# Enter test directory:"
+    - cd tiny-image-recipes
+    - "# Execute the following commands:"
+    - sysctl -w kernel.unprivileged_userns_clone=1
+    - sed s/__NAMESPACE_PLACEHOLDER__/lxc-apertis-tiny-userns/g lxc/lxc-tiny-connectivity-profile-template | apparmor_parser -qr
+    - sudo -u user -H lavatests/check-tiny-containers -a "$ARCH" -r "$RELEASE" -d "$IMAGE_DATE" -t lxc/lxc-tiny-connectivity --aa-namespace "lxc-apertis-tiny-userns"
 
 parse:
   pattern: "(?P<test_case_id>.*-*):\\s+(?P<result>(pass|fail))"
diff --git a/test-cases/sanity-check.yaml b/test-cases/sanity-check.yaml
index ad040da..403c0e1 100644
--- a/test-cases/sanity-check.yaml
+++ b/test-cases/sanity-check.yaml
@@ -59,8 +59,15 @@ metadata:
     - "This test must be executed in an image before running either automated or
        manual tests."
 
+install:
+  git-repos:
+    - url: https://gitlab.apertis.org/infrastructure/apertis-tests.git
+      branch: master
+
 run:
   steps:
+    - "# Enter test directory:"
+    - cd apertis-tests
     - "# Execute the following command:"
     - common/sanity-check
 
-- 
GitLab