diff --git a/Dockerfile.test b/Dockerfile.test index 1cceb8273..a49cf35c6 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -11,6 +11,7 @@ ARG MYSQL_PASSWORD ARG MYSQL_DATABASE ARG SCC_USERNAME ARG SCC_PASSWORD +ARG SYSTEM_UUID RUN SUSEConnect -r $REGCODE RUN zypper --non-interactive ar http://download.opensuse.org/repositories/openSUSE:/Tools/SLE_15/openSUSE:Tools.repo @@ -56,6 +57,9 @@ scc:\n\ username: $SCC_USERNAME\n\ password: $SCC_PASSWORD\n\ " >> /etc/rmt.conf +RUN mkdir -p /var/lib/rmt/ +RUN printf "$SYSTEM_UUID" >> /var/lib/rmt/system_uuid +RUN SUSEConnect -d RUN bundle diff --git a/integration.sh b/integration.sh index a3c858c75..61151ac75 100755 --- a/integration.sh +++ b/integration.sh @@ -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 diff --git a/integration/Jenkinsfile b/integration/Jenkinsfile index 1a9ff6dd7..0bf5175c4 100644 --- a/integration/Jenkinsfile +++ b/integration/Jenkinsfile @@ -27,7 +27,7 @@ pipeline { } post { always { - sh 'docker-compose down' + sh 'docker-compose -f docker-compose-test.yml down' sh 'docker system prune -f' } }