Skip to content
This repository has been archived by the owner on Jan 28, 2025. It is now read-only.

Commit

Permalink
Install bdcs.rpm from Copr instead of pulling it from S3
Browse files Browse the repository at this point in the history
  • Loading branch information
atodorov committed Mar 2, 2018
1 parent eb718d9 commit ef0ebfb
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM fedora:27

RUN dnf -y install python3-dnf-plugins-core && \
dnf -y copr enable @weldr/bdcs-haskell-deps && \
rpm --import https://copr-be.cloud.fedoraproject.org/results/@weldr/bdcs-haskell-deps/pubkey.gpg && \
dnf -y copr enable @weldr/bdcs && \
rpm --import https://copr-be.cloud.fedoraproject.org/results/@weldr/bdcs/pubkey.gpg && \
dnf -y install sudo cabal-install cabal-rpm sqlite python3-toml \
https://kojipkgs.fedoraproject.org/packages/python-parameterized/0.6.1/2.fc28/noarch/python3-parameterized-0.6.1-2.fc28.noarch.rpm \
gobject-introspection-devel \
ghc-haskell-gi-devel libgit2-glib-devel \
ostree beakerlib
ostree beakerlib bdcs

# source is bind-mounted here
WORKDIR /bdcs-cli
Expand Down
4 changes: 2 additions & 2 deletions tests/bin/import-metadata
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ set -e
# create the MDDB database if it doesn't exist
# ARG1 - OPTIONAL - a content store directory for exports

IMPORT="./bdcs-import"
# needs bdcs.rpm installed
IMPORT="/usr/libexec/weldr/bdcs-import"
SCHEMA="./schema.sql"
METADATA="metadata.db"

Expand All @@ -19,7 +20,6 @@ else
REMOVE_IMPORT_REPO=0
fi

[ -f "$IMPORT" ] || curl -o "$IMPORT" https://s3.amazonaws.com/weldr/bdcs-import && chmod a+x "$IMPORT"
[ -f "$SCHEMA" ] || curl -o "$SCHEMA" https://raw.githubusercontent.com/weldr/bdcs/master/schema.sql
sqlite3 "$METADATA" < "$SCHEMA"

Expand Down
10 changes: 2 additions & 8 deletions tests/test_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,13 @@
# exits on error but doesn't clean up
set -e

EXPORT="./bdcs-export"
BDCS_CLI="./bdcs-cli"
# needs bdcs.rpm installed
BDCS_CLI="./dist/build/bdcs-cli/bdcs-cli"

METADATA_DB="metadata.db"
METADATA_REPO="metadata.repo/"


# download precompiled binaries if not available
[ -f "./dist/build/bdcs-cli/bdcs-cli" ] && cp ./dist/build/bdcs-cli/bdcs-cli .
[ -f "$BDCS_CLI" ] || curl -o "$BDCS_CLI" https://s3.amazonaws.com/weldr/bdcs-cli && chmod a+x "$BDCS_CLI"
[ -f "$EXPORT" ] || curl -o "$EXPORT" https://s3.amazonaws.com/weldr/bdcs-export && chmod a+x "$EXPORT"


# create the database if it doesn't exist
[ -f "$METADATA_DB" ] || ./tests/bin/import-metadata $METADATA_REPO

Expand Down

0 comments on commit ef0ebfb

Please sign in to comment.