Skip to content

Commit

Permalink
Do not install recommended packages while installing RMT in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergeykot committed Aug 31, 2018
1 parent 7624fd0 commit f8eb72e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN zypper --non-interactive up
RUN zypper --non-interactive in -t pattern devel_osc_build
RUN zypper --non-interactive install --no-recommend wget curl timezone \
gcc-c++ libffi-devel git-core zlib-devel libxml2-devel libxslt-devel libmariadb-devel \
mariadb-client ruby2.5-rubygem-bundler make build sudo ruby-devel
mariadb-client mariadb ruby2.5-rubygem-bundler make build sudo ruby-devel nginx


ENV DOCKERIZE_VERSION v0.6.0
Expand Down Expand Up @@ -59,7 +59,7 @@ scc:\n\
" >> /etc/rmt.conf
RUN mkdir -p /var/lib/rmt/
RUN printf "$SYSTEM_UUID" >> /var/lib/rmt/system_uuid
RUN SUSEConnect -d
RUN SUSEConnect -d; exit 0 # register can be cached, so that deregistering will fail. this command is never cached

RUN bundle

Expand Down
2 changes: 1 addition & 1 deletion integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ osc co systemsmanagement:SCC:RMT rmt-server
cd /tmp/rmt-server/package
cp * ~/obs/systemsmanagement:SCC:RMT/rmt-server
cd ~/obs/systemsmanagement:SCC:RMT/rmt-server && osc build SLE_15 x86_64 --no-verify --trust-all-projects && cd .. &&
zypper --non-interactive --no-gpg-checks in /oscbuild/SLE_15-x86_64/home/abuild/rpmbuild/RPMS/x86_64/*
zypper --non-interactive --no-gpg-checks in --no-recommends /oscbuild/SLE_15-x86_64/home/abuild/rpmbuild/RPMS/x86_64/*
cd /usr/share/rmt
RAILS_ENV=production /usr/share/rmt/bin/rails db:create db:migrate
/usr/bin/rmt-cli sync
Expand Down

0 comments on commit f8eb72e

Please sign in to comment.