From 438a914de6054490c8a1edbb5d3a441a69ece49e Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Wed, 20 Oct 2021 12:58:26 +0200
Subject: gitlab-ci: refactor

- use one of our regular containers. (with a fixup for /usr/bin/python missing)
- keep the artefacts inside the checked out git repo

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 .gitlab-ci.yml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 79c898b..0008f40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
 # uncomment for the pipeline debug purpose
 # CI_DEBUG_TRACE: "true"
-  CI_IMAGE: gitlab.int.toradex.com:4567/oleksandr.suvorov/ci-toolchain-container:linux-kernel-builder
+  CI_IMAGE: gitlab.int.toradex.com:4567/rd/linux-bsp/ci-toolchain-container:linux-toradex_aarch32_arm_builder-bb6f84e
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
   DOCKER_TLS_CERTDIR: ""
@@ -21,11 +21,12 @@ repo-sync:
     GIT_STRATEGY: clone
   script:
     - ORIGIN=$(git remote get-url origin)
-    - mkdir -p ../bin
-    - wget -O ../bin/repo https://commondatastorage.googleapis.com/git-repo-downloads/repo
-    - chmod a+x ../bin/repo
-    - mkdir -p ../workspace
-    - cd ../workspace
+    - mkdir -p bin
+    - wget -O bin/repo https://commondatastorage.googleapis.com/git-repo-downloads/repo
+    - sed -i 's/\(\#\!\/usr\/bin\/env \)python/\1python3/' bin/repo
+    - chmod a+x bin/repo
+    - mkdir -p workspace
+    - cd workspace
     - ../bin/repo init -u $ORIGIN -b $CI_COMMIT_BRANCH -m tdxref/default.xml
     - ../bin/repo sync
     - ../bin/repo init -u $ORIGIN -b $CI_COMMIT_BRANCH -m tdxref/integration.xml
-- 
cgit v1.2.3