Commit 21657df3 authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Move scripts and docker files to subfolders.

parent 5395e31e

.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ build:container: 
        - docker

    script:

        - export DOCKER_TAG=$(echo "$CI_BUILD_REF_NAME" | sed 's#/#_#' | sed 's#^master$#latest#')

        - docker build -t $CI_REGISTRY_IMAGE:$DOCKER_TAG --build-arg http_proxy=http://www-proxy.uni-saarland.de:3128 .

        - docker build -t $CI_REGISTRY_IMAGE:$DOCKER_TAG --build-arg http_proxy=http://www-proxy.uni-saarland.de:3128 -f docker/Dockerfile .

        - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY

        - docker push $CI_REGISTRY_IMAGE:$DOCKER_TAG

        - docker rmi $CI_REGISTRY_IMAGE:$DOCKER_TAG
@@ -45,7 +45,7 @@ test:prrt_mem: 
  tags:

    - valgrind

  script:

    - bash memtest.sh

    - bash tests/memtest.sh



test:prrt_functional:

  stage: test
@@ -62,7 +62,7 @@ test:prrt_python_bindings: 
    - bash

    - python3

  script:

    - sh build.sh

    - sh tests/build.sh



deploy:pypi:

  stage: deploy

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ if(PRRT_TESTS) 
    add_custom_target(funtest COMMAND ./bin/prrtTests)

endif()



add_custom_target(perftest COMMAND python3 eval.py)

add_custom_target(perftest COMMAND python3 tests/eval.py)

add_custom_target(memtest COMMAND bash ./memtest.sh DEPENDS sender receiver)

Dockerfile→docker/Dockerfile

+1 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ RUN apt-get update \ 
COPY CMakeLists.txt /prrt/

COPY prrt /prrt/prrt

COPY tests /prrt/tests

COPY docker/entrypoint.sh /



WORKDIR /prrt
@@ -17,8 +18,6 @@ RUN cmake . \ 
ENV PATH /prrt/bin:$PATH

WORKDIR /prrt/bin



COPY entrypoint.sh /



VOLUME /output



ENTRYPOINT ["/entrypoint.sh"]

entrypoint.sh→docker/entrypoint.sh

+0 −0

File moved.

View file

build.sh→tests/build.sh

+0 −0

File moved.

View file