From 269f19eafa05eb3e02d33ac275c25d05dfefbd9f Mon Sep 17 00:00:00 2001
From: Ujwal Kundur <ujwal.kundur@gmail.com>
Date: Tue, 21 Jun 2022 08:58:13 +0530
Subject: [PATCH] Integration Test Scenario #4

spack still concretizies spack.yaml with oneapi compiler instead
of gcc. This test builds with --no-cache option to rule out spack.yaml
caching.
dev.Dockerfile has a CACHE_BUST arg for this purpose but it seems to be
set after copying spack.yaml not before. So if this works, move
CACHE_BUST before COPY instruction copying spack.
---
 .gitlab-ci.yml | 1 +
 spack.yaml     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6c79ec74f..8e0d79af6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -224,6 +224,7 @@ oneapi_jug_dev:default:
     - docker build -t ${CI_REGISTRY_IMAGE}/${BUILD_IMAGE}:${INTERNAL_TAG} 
                       -f containers/oneapi/onedev.Dockerfile
                       containers/oneapi
+                     --no-cache
     - !reference [.build, script]
 
 
diff --git a/spack.yaml b/spack.yaml
index 44d6aa428..f87e73c8b 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -42,5 +42,5 @@ spack:
     unify: true
   packages:
     all:
-      compiler: [intel]
+      compiler: [gcc]
   view: /usr/local
-- 
GitLab