From 5d905574c4a7dcd92b01c8923a37569bf4a00a50 Mon Sep 17 00:00:00 2001
From: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
Date: Mon, 14 Aug 2023 13:12:01 +0200
Subject: [PATCH] don't deloay applications

---
 .gitlab-ci.yml | 226 ++++++++++++++++++++++++-------------------------
 1 file changed, 113 insertions(+), 113 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6df5dea04..c6bf780f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,121 +86,121 @@ test:qemu:
    tags:
      - privileged
 
-test:httpd_image:
-   stage: test
-   dependencies:
-     - build:httpd
-   image: ${DOCKER_IMAGE}:${DOCKER_TAG}
-   script:
-     - dd if=/dev/zero of=disk.img bs=1k count=1M
-     - echo ',,,*;' | sfdisk disk.img
-     - mkfs.ext2 -F -E offset=1048576 disk.img
-     - kpartx -a -v disk.img
-     - LOOP_DEVICE=$(losetup -j ${PWD}/disk.img | awk '{sub(/:/,"",$1); print $1}')
-     - LOOP_NAME=$(basename ${LOOP_DEVICE})
-     - mount /dev/mapper/${LOOP_NAME}p1 /mnt/
-     - grub-install --root-directory=/mnt --locales= --themes= --fonts= --no-floppy --modules="normal part_msdos ext2 multiboot biosdisk" ${LOOP_DEVICE}
-     - cp target/x86_64-unknown-hermit/release/httpd /mnt/boot/
-     - wget -P /mnt/boot "https://github.com/hermitcore/rusty-loader/releases/download/v0.4.3/rusty-loader-x86_64"
-     - |
-       cat > /mnt/boot/grub/grub.cfg << EOF
-       default=0
-       timeout=0
-       menuentry "httpd" {
-         multiboot --quirk-bad-kludge /boot/rusty-loader-x86_64
-         module /boot/httpd
-         boot
-       }
-       EOF
-     - umount /mnt
-     - kpartx -d disk.img
-     - qemu-img convert -f raw -O qcow2 disk.img disk.qcow2
-   tags:
-     - privileged
-   artifacts:
-    paths:
-      - disk.qcow2
-   only:
-     refs:
-        - master
-
-.deploy:httpd_mvm: &deploy_httpd_mvm
-   stage: predeploy
-   dependencies:
-     - build:httpd_mvm
-   image: docker
-   before_script:
-     - docker version
-     - docker login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
-   script:
-     - cp target/x86_64-unknown-hermit/release/httpd .
-     - |
-       cat << END > ${DOCKER_FILE}
-       FROM scratch
-       ADD https://github.com/hermitcore/rusty-loader/releases/download/v0.4.3/rusty-loader-x86_64 hermit/loader
-       COPY httpd hermit/httpd
-       END
-     - docker build -f ${DOCKER_FILE} -t ${DOCKER_IMAGE}/httpd_mvm:latest .
-     - docker push ${DOCKER_IMAGE}/httpd_mvm:latest
-   tags:
-     - docker
-   only:
-     refs:
-       - master
+# test:httpd_image:
+#    stage: test
+#    dependencies:
+#      - build:httpd
+#    image: ${DOCKER_IMAGE}:${DOCKER_TAG}
+#    script:
+#      - dd if=/dev/zero of=disk.img bs=1k count=1M
+#      - echo ',,,*;' | sfdisk disk.img
+#      - mkfs.ext2 -F -E offset=1048576 disk.img
+#      - kpartx -a -v disk.img
+#      - LOOP_DEVICE=$(losetup -j ${PWD}/disk.img | awk '{sub(/:/,"",$1); print $1}')
+#      - LOOP_NAME=$(basename ${LOOP_DEVICE})
+#      - mount /dev/mapper/${LOOP_NAME}p1 /mnt/
+#      - grub-install --root-directory=/mnt --locales= --themes= --fonts= --no-floppy --modules="normal part_msdos ext2 multiboot biosdisk" ${LOOP_DEVICE}
+#      - cp target/x86_64-unknown-hermit/release/httpd /mnt/boot/
+#      - wget -P /mnt/boot "https://github.com/hermitcore/rusty-loader/releases/download/v0.4.3/rusty-loader-x86_64"
+#      - |
+#        cat > /mnt/boot/grub/grub.cfg << EOF
+#        default=0
+#        timeout=0
+#        menuentry "httpd" {
+#          multiboot --quirk-bad-kludge /boot/rusty-loader-x86_64
+#          module /boot/httpd
+#          boot
+#        }
+#        EOF
+#      - umount /mnt
+#      - kpartx -d disk.img
+#      - qemu-img convert -f raw -O qcow2 disk.img disk.qcow2
+#    tags:
+#      - privileged
+#    artifacts:
+#     paths:
+#       - disk.qcow2
+#    only:
+#      refs:
+#         - master
+#
+# .deploy:httpd_mvm: &deploy_httpd_mvm
+#    stage: predeploy
+#    dependencies:
+#      - build:httpd_mvm
+#    image: docker
+#    before_script:
+#      - docker version
+#      - docker login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
+#    script:
+#      - cp target/x86_64-unknown-hermit/release/httpd .
+#      - |
+#        cat << END > ${DOCKER_FILE}
+#        FROM scratch
+#        ADD https://github.com/hermitcore/rusty-loader/releases/download/v0.4.3/rusty-loader-x86_64 hermit/loader
+#        COPY httpd hermit/httpd
+#        END
+#      - docker build -f ${DOCKER_FILE} -t ${DOCKER_IMAGE}/httpd_mvm:latest .
+#      - docker push ${DOCKER_IMAGE}/httpd_mvm:latest
+#    tags:
+#      - docker
+#    only:
+#      refs:
+#        - master
 
-deploy:httpd_mvm:
-  <<: *deploy_httpd_mvm
+# deploy:httpd_mvm:
+#   <<: *deploy_httpd_mvm
 
-.deploy:httpd_docker: &deploy_httpd_docker
-   stage: predeploy
-   dependencies:
-     - test:httpd_image
-   image:
-     name: docker
-   before_script:
-     - docker version
-     - docker login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
-   script:
-     - |
-       cat << END > ${DOCKER_FILE}
-       FROM scratch
-       COPY disk.qcow2 /disk/
-       END
-     - docker build -f ${DOCKER_FILE} -t ${DOCKER_IMAGE}/httpd:latest .
-     - docker push ${DOCKER_IMAGE}/httpd:latest
-   tags:
-     - docker
-   only:
-     refs:
-       - master
+# .deploy:httpd_docker: &deploy_httpd_docker
+#    stage: predeploy
+#    dependencies:
+#      - test:httpd_image
+#    image:
+#      name: docker
+#    before_script:
+#      - docker version
+#      - docker login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
+#    script:
+#      - |
+#        cat << END > ${DOCKER_FILE}
+#        FROM scratch
+#        COPY disk.qcow2 /disk/
+#        END
+#      - docker build -f ${DOCKER_FILE} -t ${DOCKER_IMAGE}/httpd:latest .
+#      - docker push ${DOCKER_IMAGE}/httpd:latest
+#    tags:
+#      - docker
+#    only:
+#      refs:
+#        - master
 
-deploy:httpd_docker:
-  <<: *deploy_httpd_docker
+# deploy:httpd_docker:
+#   <<: *deploy_httpd_docker
 
-.deploy:demo_docker: &deploy_demo_docker
-   stage: predeploy
-   dependencies:
-     - build:demo
-   image:
-     name: docker
-   before_script:
-     - docker version
-     - docker login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
-   script:
-     - cp target/x86_64-unknown-hermit/release/rusty_demo .
-     - |
-       cat << END > ${DOCKER_FILE}
-       FROM registry.git.rwth-aachen.de/acs/public/hermitcore/rusty-loader/loader:latest
-       COPY rusty_demo /hermit/
-       ENTRYPOINT ["/hermit/rusty_demo"]
-       END
-     - docker build -f ${DOCKER_FILE} -t ${DOCKER_IMAGE}/demo:latest .
-     - docker push ${DOCKER_IMAGE}/demo:latest
-   tags:
-     - docker
-   only:
-     refs:
-       - master
+# .deploy:demo_docker: &deploy_demo_docker
+#    stage: predeploy
+#    dependencies:
+#      - build:demo
+#    image:
+#      name: docker
+#    before_script:
+#      - docker version
+#      - docker login --username "${CI_REGISTRY_USER}" --password "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}"
+#    script:
+#      - cp target/x86_64-unknown-hermit/release/rusty_demo .
+#      - |
+#        cat << END > ${DOCKER_FILE}
+#        FROM registry.git.rwth-aachen.de/acs/public/hermitcore/rusty-loader/loader:latest
+#        COPY rusty_demo /hermit/
+#        ENTRYPOINT ["/hermit/rusty_demo"]
+#        END
+#      - docker build -f ${DOCKER_FILE} -t ${DOCKER_IMAGE}/demo:latest .
+#      - docker push ${DOCKER_IMAGE}/demo:latest
+#    tags:
+#      - docker
+#    only:
+#      refs:
+#        - master
 
-deploy:demo_docker:
-  <<: *deploy_demo_docker
+# deploy:demo_docker:
+#   <<: *deploy_demo_docker