Skip to content

Commit

Permalink
Remove unnecessary testdata from irods_client
Browse files Browse the repository at this point in the history
  • Loading branch information
dometto committed May 22, 2024
1 parent e4b8e8b commit bc41c12
Show file tree
Hide file tree
Showing 19 changed files with 3 additions and 1,001 deletions.
27 changes: 3 additions & 24 deletions docker/irods_client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,11 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/* /tmp/*

RUN mkdir -p /root/.irods
COPY docker/irods_client/environments/plain-irods/irods_environment.json /root/.irods
COPY docker/irods_client/environments/plain-irods/irods_environment_testuser.json /root/.irods
COPY environments/plain-irods/irods_environment.json /root/.irods
COPY environments/plain-irods/irods_environment_testuser.json /root/.irods

RUN mkdir -p /tmp
ADD docker/irods_client/testdata /tmp/testdata/

# install python 3
RUN apt-get update && \
apt-get upgrade -y
RUN apt-get install -y python3 git
# python3-pip \
# git

# Work around for a bug in Ubuntu 22.04: https://github.com/pypa/setuptools/issues/3269#ref-issue-1217398136
RUN wget https://bootstrap.pypa.io/get-pip.py
RUN python3 get-pip.py
RUN mkdir -p /ibridges/integration_test
ADD ibridges /ibridges/ibridges
ADD docker/irods_client/tests ibridges/integration_test
ADD docker/irods_client/environments/plain-irods ibridges/integration_test/environment
ADD .git /ibridges/.git
COPY pyproject.toml /ibridges
RUN /usr/local/bin/pip3 install /ibridges
RUN /usr/local/bin/pip3 install pytest tomli

WORKDIR /
COPY docker/irods_client/entrypoint.sh .
COPY entrypoint.sh .
RUN chmod u+x ./entrypoint.sh
ENTRYPOINT bash -c "./entrypoint.sh"
3 changes: 0 additions & 3 deletions docker/irods_client/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ iadmin moduser testuser password testuser
echo 'testuser created'
echo $(iadmin lu testuser)

cd /ibridges/integration_test
pytest .

result=$?
if [[ -z "$CI" ]]; then
/bin/bash
Expand Down
17 changes: 0 additions & 17 deletions docker/irods_client/testdata/beach.rtf

This file was deleted.

307 changes: 0 additions & 307 deletions docker/irods_client/testdata/bunny.rtf

This file was deleted.

7 changes: 0 additions & 7 deletions docker/irods_client/testdata/example.r

This file was deleted.

Loading

0 comments on commit bc41c12

Please sign in to comment.