Merge branch 'patch-axel-5' into zcu102_ci

seL4 · Jan 24, 2024 · 5378066 · 5378066
2 parents edb489b + da95809
commit 5378066
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 43 deletions.
diff --git a/sel4test-hw/Dockerfile b/sel4test-hw/Dockerfile
@@ -2,39 +2,26 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 
-# The context of this Dockerfiles is the repo root (../)
-
 ARG WORKSPACE=/workspace
 ARG SCRIPTS=/ci-scripts
 ARG ACTION=sel4test-hw
 
-FROM trustworthysystems/sel4:latest
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-       libffi-dev \
-    && apt-get clean autoclean \
-    && apt-get autoremove --yes \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
-RUN pip3 install junitparser PyGithub
+FROM sel4/sel4test-hw:latest
 
 ARG SCRIPTS
 ARG ACTION
-RUN mkdir ${SCRIPTS}
-COPY ${ACTION}/steps.sh scripts/* ${SCRIPTS}/
+
+COPY steps.sh ${SCRIPTS}/
 RUN chmod a+rx ${SCRIPTS}/*
-ENV  PATH "${SCRIPTS}:${PATH}"
 
-RUN mkdir /builds
-COPY ${ACTION}/builds.yml \
-     ${ACTION}/build.py \
+COPY builds.yml \
+     build.py \
      seL4-platforms/platforms.yml \
      seL4-platforms/platforms.py \
      seL4-platforms/builds.py \
-     /builds/
+     /builds
 
 ARG WORKSPACE
-RUN mkdir -p ${WORKSPACE}
 WORKDIR ${WORKSPACE}
 
-ENTRYPOINT steps.sh
+ENTRYPOINT /ci-scripts/steps.sh
diff --git a/sel4test-hw/action.yml b/sel4test-hw/action.yml
@@ -38,4 +38,4 @@ inputs:
 
 runs:
   using: 'docker'
-  image: 'docker://sel4/sel4test-hw:latest'
+  image: 'Dockerfile'
diff --git a/sel4test-hw/seL4-platforms b/sel4test-hw/seL4-platforms
@@ -0,0 +1 @@
+../seL4-platforms
diff --git a/sel4test-sim/Dockerfile b/sel4test-sim/Dockerfile
@@ -2,39 +2,25 @@
 #
 # SPDX-License-Identifier: BSD-2-Clause
 
-# The context of this Dockerfiles is the repo root (../)
-
 ARG WORKSPACE=/workspace
 ARG SCRIPTS=/ci-scripts
 ARG ACTION=sel4test-sim
 
-FROM trustworthysystems/sel4:latest
-
-RUN apt-get update \
-    && apt-get install -y --no-install-recommends \
-       libffi-dev \
-    && apt-get clean autoclean \
-    && apt-get autoremove --yes \
-    && rm -rf /var/lib/{apt,dpkg,cache,log}/
-RUN pip3 install junitparser PyGithub
+FROM sel4/sel4test-sim:latest
 
 ARG SCRIPTS
 ARG ACTION
-RUN mkdir ${SCRIPTS}
-COPY ${ACTION}/steps.sh scripts/* ${SCRIPTS}/
+
+COPY steps.sh ${SCRIPTS}/
 RUN chmod a+rx ${SCRIPTS}/*
-ENV  PATH "${SCRIPTS}:${PATH}"
 
-RUN mkdir /builds
-COPY ${ACTION}/builds.yml \
-     ${ACTION}/build.py \
-     seL4-platforms/platforms.yml \
+COPY builds.yml \
+     build.py \
      seL4-platforms/platforms.py \
      seL4-platforms/builds.py \
-     /builds/
+     /builds
 
 ARG WORKSPACE
-RUN mkdir -p ${WORKSPACE}
 WORKDIR ${WORKSPACE}
 
-ENTRYPOINT steps.sh
+ENTRYPOINT /ci-scripts/steps.sh
diff --git a/sel4test-sim/action.yml b/sel4test-sim/action.yml
@@ -36,4 +36,4 @@ inputs:
 
 runs:
   using: 'docker'
-  image: 'docker://sel4/sel4test-sim:latest'
+  image: 'Dockerfile'
diff --git a/sel4test-sim/seL4-platforms b/sel4test-sim/seL4-platforms
@@ -0,0 +1 @@
+../seL4-platforms