From 5793cefff8d60bd96cd49c9163f2ef8d7f6ec23b Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Thu, 10 Jun 2021 11:10:10 +0100
Subject: [PATCH] ci/lava: Move LAVA files to lava/

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11309>
---
 .gitlab-ci.yml                              | 2 +-
 .gitlab-ci/{ => lava}/lava-gitlab-ci.yml    | 4 ++--
 .gitlab-ci/{ => lava}/lava.yml.jinja2       | 0
 .gitlab-ci/{ => lava}/lava_job_submitter.py | 0
 .gitlab-ci/prepare-artifacts.sh             | 4 +---
 5 files changed, 4 insertions(+), 6 deletions(-)
 rename .gitlab-ci/{ => lava}/lava-gitlab-ci.yml (97%)
 rename .gitlab-ci/{ => lava}/lava.yml.jinja2 (100%)
 rename .gitlab-ci/{ => lava}/lava_job_submitter.py (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b72387512fc..ea06160e8e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,7 @@ include:
     ref: *ci-templates-commit
     file:
       - '/templates/debian.yml'
-  - local: '.gitlab-ci/lava-gitlab-ci.yml'
+  - local: '.gitlab-ci/lava/lava-gitlab-ci.yml'
   - local: '.gitlab-ci/test-source-dep.yml'
   - local: 'src/amd/ci/gitlab-ci.yml'
   - local: 'src/broadcom/ci/gitlab-ci.yml'
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava/lava-gitlab-ci.yml
similarity index 97%
rename from .gitlab-ci/lava-gitlab-ci.yml
rename to .gitlab-ci/lava/lava-gitlab-ci.yml
index 9b7fd3a6200..f633019bc27 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava/lava-gitlab-ci.yml
@@ -21,8 +21,8 @@
     - rm -rf results
     - mkdir -p results
     - >
-      artifacts/lava_job_submitter.py \
-        --template artifacts/lava.yml.jinja2 \
+      artifacts/lava/lava_job_submitter.py \
+        --template artifacts/lava/lava.yml.jinja2 \
         --pipeline-info "$CI_PIPELINE_URL on $CI_COMMIT_REF_NAME ${CI_NODE_INDEX}/${CI_NODE_TOTAL}" \
         --base-artifacts-url ${ARTIFACTS_URL} \
         --mesa-url ${MESA_URL} \
diff --git a/.gitlab-ci/lava.yml.jinja2 b/.gitlab-ci/lava/lava.yml.jinja2
similarity index 100%
rename from .gitlab-ci/lava.yml.jinja2
rename to .gitlab-ci/lava/lava.yml.jinja2
diff --git a/.gitlab-ci/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py
similarity index 100%
rename from .gitlab-ci/lava_job_submitter.py
rename to .gitlab-ci/lava/lava_job_submitter.py
diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
index d311ed59e75..5f8f81efaf9 100755
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -45,12 +45,10 @@ find . -path \*/ci/\*.txt \
 # packed separately in the zip file.
 mkdir -p artifacts/
 tar -cf artifacts/install.tar install
+cp -Rp .gitlab-ci/lava artifacts/
 
 if [ -n "$MINIO_ARTIFACT_NAME" ]; then
     # Pass needed files to the test stage
-    cp $CI_PROJECT_DIR/.gitlab-ci/lava_job_submitter.py artifacts/.
-    cp $CI_PROJECT_DIR/.gitlab-ci/lava.yml.jinja2 artifacts/.
-
     MINIO_ARTIFACT_NAME="$MINIO_ARTIFACT_NAME.tar.gz"
     gzip -c artifacts/install.tar > ${MINIO_ARTIFACT_NAME}
     MINIO_PATH=${MINIO_HOST}/artifacts/${CI_PROJECT_PATH}/${CI_PIPELINE_ID}