From 85f2a93c0a587943c8f1afbc439ce6fe0934f82a Mon Sep 17 00:00:00 2001
From: Jon Mason <jon.mason@arm.com>
Date: Mon, 26 Jul 2021 10:51:41 -0400
Subject: [PATCH] CI: merge testimage into the build stage

Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 .gitlab-ci.yml   | 98 +++++++-----------------------------------------
 ci/testimage.yml |  1 +
 2 files changed, 14 insertions(+), 85 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93849dcc..9f00409d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,6 @@ stages:
   - prep
   - bootstrap
   - build
-  - test
 
 # Common job fragment to get a worker ready
 .setup:
@@ -35,26 +34,6 @@ stages:
     - kas build $KASFILES
     - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log
 
-.build_artifacts:
-  artifacts:
-    paths:
-      - $IMAGE_DIR/*
-    expire_in: 1 day
-
-.test:
-  extends: .setup
-  stage: test
-  # Unique before_script here to avoid the rm from the one in .setup
-  before_script:
-    - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR $TOOLCHAIN_DIR
-  script:
-    - KASFILES=$(./ci/jobs-to-kas $CI_JOB_NAME)
-    # These are needed to avoid warnings about file permissions from the artifacts
-    - sudo chown -R builder $KAS_WORK_DIR
-    - sudo chgrp -R builder $KAS_WORK_DIR
-    - kas build $KASFILES -c testimage
-
-
 #
 # Prep stage, update repositories once
 #
@@ -159,40 +138,26 @@ n1sdp/armgcc:
 qemu-cortex-a53:
   extends: .build
 
-qemuarm:
-  extends:
-    - .build
-    - .build_artifacts
+qemuarm/testimage:
+  extends: .build
 
 qemuarm64-sbsa:
-  extends:
-    - .build
-    - .build_artifacts
+  extends: .build
 
-qemuarm64-secureboot:
-  extends:
-    - .build
-    - .build_artifacts
+qemuarm64-secureboot/testimage:
+  extends: .build
 
-qemuarm64-secureboot/clang:
-  extends:
-    - .build
-    - .build_artifacts
+qemuarm64-secureboot/clang/testimage:
+  extends: .build
 
-qemuarm64-secureboot/clang/musl:
-  extends:
-    - .build
-    - .build_artifacts
+qemuarm64-secureboot/clang/musl/testimage:
+  extends: .build
 
-qemuarm64-secureboot/musl:
-  extends:
-    - .build
-    - .build_artifacts
+qemuarm64-secureboot/musl/testimage:
+  extends: .build
 
-qemuarmv5:
-  extends:
-    - .build
-    - .build_artifacts
+qemuarmv5/testimage:
+  extends: .build
 
 sgi575:
   extends: .build
@@ -201,43 +166,6 @@ tc0:
   extends: .build
 
 
-#
-# Third phase, the test jobs
-#
-
-# QEMU based machines can use testimage, others will need something else (i.e., LAVA)
-
-qemuarm/testimage:
-  extends: .test
-  needs:
-    - job: qemuarm
-
-qemuarm64-secureboot/testimage:
-  extends: .test
-  needs:
-    - job: qemuarm64-secureboot
-
-qemuarm64-secureboot/clang/testimage:
-  extends: .test
-  needs:
-    - job: qemuarm64-secureboot/clang
-
-qemuarm64-secureboot/clang/musl/testimage:
-  extends: .test
-  needs:
-    - job: qemuarm64-secureboot/clang/musl
-
-qemuarm64-secureboot/musl/testimage:
-  extends: .test
-  needs:
-    - job: qemuarm64-secureboot/musl
-
-qemuarmv5/testimage:
-  extends: .test
-  needs:
-    - job: qemuarmv5
-
-
 #
 # Utility tasks, not executed automatically
 #
diff --git a/ci/testimage.yml b/ci/testimage.yml
index df2c22e8..adc7765a 100644
--- a/ci/testimage.yml
+++ b/ci/testimage.yml
@@ -4,6 +4,7 @@ header:
 local_conf_header:
   testimage: |
     IMAGE_CLASSES += "testimage"
+    TESTIMAGE_AUTO = "1"
   slirp: |
     TEST_RUNQEMUPARAMS = "slirp"
     TEST_SERVER_IP = "127.0.0.1"