Skip to contentSkip to conversation

Isar update and CI tuning

PATCH New Jan Kiszka 1 participant 3 messages Apr 14, 2022

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

cover Isar update and CI tuning

See patches for details.

Jan

Jan Kiszka (2):
Update Isar revision
ci: Apply DNS hack also on test instances

 ci/gitlab-ci-base.yml | 8 ++++----
 kas.yml               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 1/2 Update Isar revision

From: Jan Kiszka <[email protected]>

Various fixes and better control over sstate.

---
 kas.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kas.yml +1 -1
index 62ddbb4..6b3b32d 100644
@@ -22,7 +22,7 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    refspec: eeefa03185e3f259d08ff94295b0981a19eddf55
+    refspec: a960a4e52c50ef4a15e382768eeee5fa9cfffead
     layers:
       meta:
 
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 2/2 ci: Apply DNS hack also on test instances

In reply to Jan Kiszka

From: Jan Kiszka <[email protected]>

We've seen DNS issues with the AWS defaults also on the test jobs. Therefore, expand the scope of the hack to all jobs by generalizing .add-proxy-config to .common-config.

---
 ci/gitlab-ci-base.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
ci/gitlab-ci-base.yml +4 -4
index 057b9dd..7c65ca0 100644
@@ -26,8 +26,9 @@ variables:
 default:
   image: ghcr.io/siemens/kas/kas-isar:2.6.3
 
-.add-proxy-config:
+.common-config:
   before_script:
+    - sudo sh -c "echo 'nameserver 8.8.8.8' > /etc/resolv.conf"
     - mkdir -p -m=700 ~/.ssh
     - if [ -n "$https_proxy" ]; then
           echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed 's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed 's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config;
@@ -35,16 +36,15 @@ default:
       fi
 
 .build:
-  extends: .add-proxy-config
+  extends: .common-config
   stage: build
   script:
-    - sudo sh -c "echo 'nameserver 8.8.8.8' > /etc/resolv.conf"
     - echo "Building kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-ci.yml"
     - kas build kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}:opt-ci.yml
     - if [ -n "${USE_S3_BUCKET}" ]; then scripts/deploy_to_aws.sh ${TARGET}; fi
 
 .test:
-  extends: .add-proxy-config
+  extends: .common-config
   stage: test
   script:
     - scripts/install-lavacli.sh
Signature · 1 line
2.34.1