From 08c90ba272270b398cffe96f8dd61074d0596ab9 Mon Sep 17 00:00:00 2001
From: MoritzScherer <scheremo@iis.ee.ethz.ch>
Date: Fri, 2 Aug 2024 13:55:30 +0200
Subject: [PATCH] CI: Support test case insertion into nonfree repo (#19)

* CI: Indirect test case insertion into nonfree repo
---
 .gitlab/gitlab-ci.yml   | 19 ++++++++++++++++---
 .gitlab/nonfree-var.yml | 12 ------------
 2 files changed, 16 insertions(+), 15 deletions(-)
 delete mode 100644 .gitlab/nonfree-var.yml

diff --git a/.gitlab/gitlab-ci.yml b/.gitlab/gitlab-ci.yml
index d31d242..f3f42dc 100644
--- a/.gitlab/gitlab-ci.yml
+++ b/.gitlab/gitlab-ci.yml
@@ -6,6 +6,9 @@
 
 # We initialize the nonfree repo, then spawn a sub-pipeline from it
 
+variables:
+  VSIM_TESTS: '["testCluster", "testClusterOffload"]'
+    
 stages:
   - nonfree
 
@@ -15,11 +18,21 @@ init:
   artifacts:
     paths: [ nonfree/ci.yml ]
 
+process:
+    stage: nonfree
+    needs: [ init ]
+    script:
+      - envsubst '${VSIM_TESTS}' < nonfree/ci.yml > nonfree/processed_ci.yml
+    artifacts:
+      paths: [ nonfree/processed_ci.yml ]
+    
 subpipe:
   stage: nonfree
-  needs: [ init ]
+  needs: [ process ]
   trigger:
     include:
-      - artifact: nonfree/ci.yml
-        job: init
+      - artifact: nonfree/processed_ci.yml
+        job: process
+    forward:
+      pipeline_variables: true
     strategy: depend
diff --git a/.gitlab/nonfree-var.yml b/.gitlab/nonfree-var.yml
deleted file mode 100644
index 00dd23d..0000000
--- a/.gitlab/nonfree-var.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2024 ETH Zurich and University of Bologna.
-# Licensed under the Apache License, Version 2.0, see LICENSE for details.
-# SPDX-License-Identifier: Apache-2.0
-
-# Author: Sergio Mazzola <smazzola@iis.ee.ethz.ch>
-
-# Variables used in the CI manifest included in the nonfree repository
-
-variables:
-  VSIM-TESTS:
-    - testCluster
-    - testClusterOffload
\ No newline at end of file