Revert "use git-lfs for test files"

This reverts commit bf4b660568.
This commit is contained in:
André Roth
2024-11-08 15:15:00 +01:00
parent 6647f6d0e0
commit dd4f90e4c2
9 changed files with 8 additions and 17 deletions

3
.gitattributes vendored
View File

@@ -1,3 +0,0 @@
*.deb filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text

View File

@@ -40,7 +40,6 @@ jobs:
with: with:
# fetch the whole repo for `git describe` to work # fetch the whole repo for `git describe` to work
fetch-depth: 0 fetch-depth: 0
lfs: true
- name: "Run flake8" - name: "Run flake8"
run: | run: |

View File

@@ -70,13 +70,10 @@ if that is possible.
### Get the Source ### Get the Source
Make sure git with LFS support ist installed.
To clone the git repo, run the following commands: To clone the git repo, run the following commands:
``` ```
git clone git@github.com:aptly-dev/aptly.git git clone git@github.com:aptly-dev/aptly.git
cd aptly cd aptly
git lfs checkout
``` ```
## Development Setup ## Development Setup

View File

@@ -85,9 +85,10 @@ test: prepare swagger etcd-install ## Run unit tests
system-test: prepare swagger etcd-install ## Run system tests system-test: prepare swagger etcd-install ## Run system tests
# build coverage binary # build coverage binary
go test -v -coverpkg="./..." -c -tags testruncli go test -v -coverpkg="./..." -c -tags testruncli
# Extract fixture-db, fixture-pool, etcd.db # Download fixture-db, fixture-pool, etcd.db
test -e ~/aptly-fixture-db || tar -C ~/ -xf system/files/aptly-fixture.tar.xz if [ ! -e ~/aptly-fixture-db ]; then git clone https://github.com/aptly-dev/aptly-fixture-db.git ~/aptly-fixture-db/; fi
test -f ~/etcd.db || xz -dc system/files/etcd.db.xz > ~/etcd.db if [ ! -e ~/aptly-fixture-pool ]; then git clone https://github.com/aptly-dev/aptly-fixture-pool.git ~/aptly-fixture-pool/; fi
test -f ~/etcd.db || (curl -o ~/etcd.db.xz http://repo.aptly.info/system-tests/etcd.db.xz && xz -d ~/etcd.db.xz)
# Run system tests # Run system tests
PATH=$(BINPATH)/:$(PATH) && FORCE_COLOR=1 $(PYTHON) system/run.py --long --coverage-dir $(COVERAGE_DIR) $(CAPTURE) $(TEST) PATH=$(BINPATH)/:$(PATH) && FORCE_COLOR=1 $(PYTHON) system/run.py --long --coverage-dir $(COVERAGE_DIR) $(CAPTURE) $(TEST)

View File

@@ -6,7 +6,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends curl gnupg b
golang/bookworm-backports golang-go/bookworm-backports golang-doc/bookworm-backports golang-src/bookworm-backports \ golang/bookworm-backports golang-go/bookworm-backports golang-doc/bookworm-backports golang-src/bookworm-backports \
make git python3 python3-requests-unixsocket python3-termcolor python3-swiftclient python3-boto python3-azure-storage \ make git python3 python3-requests-unixsocket python3-termcolor python3-swiftclient python3-boto python3-azure-storage \
g++ python3-etcd3 python3-plyvel graphviz devscripts sudo dh-golang binutils-i686-linux-gnu binutils-aarch64-linux-gnu \ g++ python3-etcd3 python3-plyvel graphviz devscripts sudo dh-golang binutils-i686-linux-gnu binutils-aarch64-linux-gnu \
binutils-arm-linux-gnueabihf bash-completion zip ruby3.1-dev git-lfs && \ binutils-arm-linux-gnueabihf bash-completion zip ruby3.1-dev && \
apt-get clean && rm -rf /var/lib/apt/lists/* apt-get clean && rm -rf /var/lib/apt/lists/*
RUN useradd -m --shell /bin/bash --home-dir /var/lib/aptly aptly RUN useradd -m --shell /bin/bash --home-dir /var/lib/aptly aptly
@@ -16,6 +16,9 @@ RUN mkdir /work
WORKDIR /work/src WORKDIR /work/src
RUN chown aptly /work RUN chown aptly /work
RUN cd /var/lib/aptly; git clone https://github.com/aptly-dev/aptly-fixture-db.git
RUN cd /var/lib/aptly; git clone https://github.com/aptly-dev/aptly-fixture-pool.git
RUN cd /var/lib/aptly; curl -O http://repo.aptly.info/system-tests/etcd.db.xz && xz -d etcd.db.xz
RUN echo "aptly ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/aptly RUN echo "aptly ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/aptly
ADD system/t13_etcd/install-etcd.sh /src/ ADD system/t13_etcd/install-etcd.sh /src/
RUN /src/install-etcd.sh RUN /src/install-etcd.sh

Binary file not shown.

Binary file not shown.