From 81ec453fc5c623a5109df89592f29acc669975f2 Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Sun, 18 Apr 2021 09:05:22 -0700
Subject: [PATCH] gitlab-ci: cleanup after_script

Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 .gitlab-ci.yml | 51 +++++++++++++++-----------------------------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ef96ff..5634762 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,3 +1,12 @@
+.after-my-script: &after-my-script
+    - cd $CI_PROJECT_DIR/poky
+    - . ./oe-init-build-env $CI_PROJECT_DIR/build
+    - for x in `ls $CI_PROJECT_DIR/build/tmp/log/error-report/ | grep error_report_`; do
+    - send-error-report -y tmp/log/error-report/$x
+    - done
+    - rm -fr $CI_PROJECT_DIR/build
+
+
 stages:
   - .pre
   - build
@@ -20,63 +29,33 @@ stages:
 .build:
   stage: build
   after_script:
-    - cd $CI_PROJECT_DIR/poky
-    - . ./oe-init-build-env $CI_PROJECT_DIR/build
-    - for x in `ls $CI_PROJECT_DIR/build/tmp/log/error-report/ | grep error_report_`; do
-    - send-error-report -y tmp/log/error-report/$x
-    - done
-    - rm -fr $CI_PROJECT_DIR/build
+    - *after-my-script
 
 .parsec:
   stage: parsec 
   after_script:
-    - cd $CI_PROJECT_DIR/poky
-    - . ./oe-init-build-env $CI_PROJECT_DIR/build
-    - for x in `ls $CI_PROJECT_DIR/build/tmp/log/error-report/ | grep error_report_`; do
-    - send-error-report -y tmp/log/error-report/$x
-    - done
-    - rm -fr $CI_PROJECT_DIR/build
+    - *after-my-script
 
 
 .multi:
   stage: multi
   after_script:
-    - cd $CI_PROJECT_DIR/poky
-    - . ./oe-init-build-env $CI_PROJECT_DIR/build
-    - for x in `ls $CI_PROJECT_DIR/build/tmp/log/error-report/ | grep error_report_`; do
-    - send-error-report -y tmp/log/error-report/$x
-    - done
-    - rm -fr $CI_PROJECT_DIR/build
+    - *after-my-script
 
 .alt:
   stage: alt
   after_script:
-    - cd $CI_PROJECT_DIR/poky
-    - . ./oe-init-build-env $CI_PROJECT_DIR/build
-    - for x in `ls $CI_PROJECT_DIR/build/tmp/log/error-report/ | grep error_report_`; do
-    - send-error-report -y tmp/log/error-report/$x
-    - done
-    - rm -fr $CI_PROJECT_DIR/build
+    - *after-my-script
 
 .musl:
   stage: musl
   after_script:
-    - cd $CI_PROJECT_DIR/poky
-    - . ./oe-init-build-env $CI_PROJECT_DIR/build
-    - for x in `ls $CI_PROJECT_DIR/build/tmp/log/error-report/ | grep error_report_`; do
-    - send-error-report -y tmp/log/error-report/$x
-    - done
-    - rm -fr $CI_PROJECT_DIR/build
+    - *after-my-script
 
 .test:
   stage: test 
   after_script:
-    - cd $CI_PROJECT_DIR/poky
-    - . ./oe-init-build-env $CI_PROJECT_DIR/build
-    - for x in `ls $CI_PROJECT_DIR/build/tmp/log/error-report/ | grep error_report_`; do
-    - send-error-report -y tmp/log/error-report/$x
-    - done
-    - rm -fr $CI_PROJECT_DIR/build
+    - *after-my-script
 
 
 qemux86: