On 17.02.20 17:12, Gylstorff Quirin wrote:
On 2/17/20 12:45 PM, Jan Kiszka wrote:
On 17.02.20 12:43, Jan Kiszka via Xenomai wrote:
On 14.02.20 13:26, Q. Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylsto...@siemens.com>
Gitlab uses extends as an alternative to YAML Anchors since 11.3.
Signed-off-by: Quirin Gylstorff <quirin.gylsto...@siemens.com>
---
.gitlab-ci.yml | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5dd3c1..4b3f970 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,22 +25,23 @@ default:
# add lavacli to the container and install the ssh keys
# for the test infrastructure
-.add-lava-ssh-config: &lava-ssh-key
+.add-lava-ssh-config:
before_script:
- mkdir -p -m=700 ~/.ssh
- echo "$LAVA_SSH_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/id_rsa &&
chmod 600 ~/.ssh/id_rsa
- echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed
's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed
's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config && chmod 600 ~/.ssh/config
- echo "$LAVA_SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts && chmod
644 ~/.ssh/known_hosts
-.build: &build-job
- <<: *lava-ssh-key
+.build:
+ extends: .add-lava-ssh-config
stage: build
script:
- kas build
kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}
- scripts/deploy_for_testing.sh ${TARGET}
-.test: &test-job
- <<: *lava-ssh-key
+.test:
+ extends: .add-lava-ssh-config
+ image: kasproject/kas-isar:latest
This image is new (or I missed it in v1). Intentional?
BTW, changing to kas-isar:2.0 might be good so that we do not run into
surprises with CI.
I can do that in a v3.
No need for v3, but I'd take a patch on top.
Jan
Jan
This was added by my for local testing - if you execute the gitlab ci
runner on your own machine it does not read the default settings and
each test needs to addd its own image. This entry can be removed.
OK, done so while merging the series.
Thanks,
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
