Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46803 )
Change subject: util/docker: Update agent-root to node-root for jenkins ......................................................................
util/docker: Update agent-root to node-root for jenkins
Jenkins has changed the name of the build directory, so it's not currently building out of memory, it's writing to the SSD. This changes the build back to tmpfs.
Signed-off-by: Martin Roth martin@coreboot.org Change-Id: Iefcf53757862feb2025aa5696f9f5dbce9dd70dd --- M util/docker/coreboot-jenkins-node/Dockerfile 1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/46803/1
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 0442efc..e9d866b 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -35,13 +35,13 @@ chmod 0755 /var/run/sshd && \ /usr/bin/ssh-keygen -A
-# Create /cb-build as a tmpfs directory to build in +# Create tmpfs directories to build in RUN mkdir /cb-build && \ chown coreboot:coreboot /cb-build && \ echo "tmpfs /cb-build tmpfs rw,mode=1777 0 0" > /etc/fstab && \ - mkdir -p /home/coreboot/agent-root/workspace && \ - chown -R coreboot:coreboot /home/coreboot/agent-root && \ - echo "tmpfs /home/coreboot/agent-root/workspace tmpfs rw,mode=1777 0 0" >> /etc/fstab && \ + mkdir -p /home/coreboot/node-root/workspace && \ + chown -R coreboot:coreboot /home/coreboot/node-root && \ + echo "tmpfs /home/coreboot/node-root/workspace tmpfs rw,mode=1777 0 0" >> /etc/fstab && \ chown coreboot:coreboot /home/coreboot/.ccache && \ echo "tmpfs /home/coreboot/.ccache tmpfs rw,mode=1777 0 0" >> /etc/fstab
@@ -53,8 +53,8 @@
VOLUME /data/cache ENTRYPOINT mount /cb-build && \ - mount /home/coreboot/agent-root/workspace && \ - chown -R coreboot:coreboot /home/coreboot/agent-root && \ + mount /home/coreboot/node-root/workspace && \ + chown -R coreboot:coreboot /home/coreboot/node-root && \ mount /home/coreboot/.ccache && \ chown coreboot:coreboot /home/coreboot/.ccache && \ /usr/sbin/sshd -p 49151 -D
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46803 )
Change subject: util/docker: Update agent-root to node-root for jenkins ......................................................................
Patch Set 1: Code-Review+2
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46803 )
Change subject: util/docker: Update agent-root to node-root for jenkins ......................................................................
util/docker: Update agent-root to node-root for jenkins
Jenkins has changed the name of the build directory, so it's not currently building out of memory, it's writing to the SSD. This changes the build back to tmpfs.
Signed-off-by: Martin Roth martin@coreboot.org Change-Id: Iefcf53757862feb2025aa5696f9f5dbce9dd70dd Reviewed-on: https://review.coreboot.org/c/coreboot/+/46803 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Georgi pgeorgi@google.com --- M util/docker/coreboot-jenkins-node/Dockerfile 1 file changed, 6 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 0442efc..e9d866b 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -35,13 +35,13 @@ chmod 0755 /var/run/sshd && \ /usr/bin/ssh-keygen -A
-# Create /cb-build as a tmpfs directory to build in +# Create tmpfs directories to build in RUN mkdir /cb-build && \ chown coreboot:coreboot /cb-build && \ echo "tmpfs /cb-build tmpfs rw,mode=1777 0 0" > /etc/fstab && \ - mkdir -p /home/coreboot/agent-root/workspace && \ - chown -R coreboot:coreboot /home/coreboot/agent-root && \ - echo "tmpfs /home/coreboot/agent-root/workspace tmpfs rw,mode=1777 0 0" >> /etc/fstab && \ + mkdir -p /home/coreboot/node-root/workspace && \ + chown -R coreboot:coreboot /home/coreboot/node-root && \ + echo "tmpfs /home/coreboot/node-root/workspace tmpfs rw,mode=1777 0 0" >> /etc/fstab && \ chown coreboot:coreboot /home/coreboot/.ccache && \ echo "tmpfs /home/coreboot/.ccache tmpfs rw,mode=1777 0 0" >> /etc/fstab
@@ -53,8 +53,8 @@
VOLUME /data/cache ENTRYPOINT mount /cb-build && \ - mount /home/coreboot/agent-root/workspace && \ - chown -R coreboot:coreboot /home/coreboot/agent-root && \ + mount /home/coreboot/node-root/workspace && \ + chown -R coreboot:coreboot /home/coreboot/node-root && \ mount /home/coreboot/.ccache && \ chown coreboot:coreboot /home/coreboot/.ccache && \ /usr/sbin/sshd -p 49151 -D
-
Martin Roth (Code Review) -
Patrick Georgi (Code Review)