From 1e7941ffe2512de30bceb620dd4be6f65877bac0 Mon Sep 17 00:00:00 2001
From: Serhii Kotov <skotov@suse.com>
Date: Wed, 29 Aug 2018 18:17:04 +0200
Subject: [PATCH 1/4] Deregister RMT after integration tests

---
 integration/Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/integration/Jenkinsfile b/integration/Jenkinsfile
index 1a9ff6dd7..5ffe45850 100644
--- a/integration/Jenkinsfile
+++ b/integration/Jenkinsfile
@@ -27,6 +27,7 @@ pipeline {
   }
   post {
     always {
+      sh 'docker-compose -f docker-compose-test.yml run rmt_test SUSEConnect -d'
       sh 'docker-compose down'
       sh 'docker system prune -f'
     }

From 9853043ab1033f4917643ed7cdb1348b5dd10a1d Mon Sep 17 00:00:00 2001
From: Serhii Kotov <skotov@suse.com>
Date: Thu, 30 Aug 2018 16:48:26 +0200
Subject: [PATCH 2/4] Set RMT system UUID in integration test

---
 Dockerfile.test         | 3 +++
 integration/Jenkinsfile | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 1cceb8273..5d699fe6b 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,8 @@ 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 bundle
 
diff --git a/integration/Jenkinsfile b/integration/Jenkinsfile
index 5ffe45850..ef9d379d9 100644
--- a/integration/Jenkinsfile
+++ b/integration/Jenkinsfile
@@ -28,7 +28,7 @@ pipeline {
   post {
     always {
       sh 'docker-compose -f docker-compose-test.yml run rmt_test SUSEConnect -d'
-      sh 'docker-compose down'
+      sh 'docker-compose -f docker-compose-test.yml down'
       sh 'docker system prune -f'
     }
   }

From 7624fd02eab680dfb53bc79319d12d686abd7ffd Mon Sep 17 00:00:00 2001
From: Serhii Kotov <skotov@suse.com>
Date: Fri, 31 Aug 2018 11:38:47 +0200
Subject: [PATCH 3/4] Deregister RMT host system in Dockerfile.test

---
 Dockerfile.test         | 1 +
 integration/Jenkinsfile | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.test b/Dockerfile.test
index 5d699fe6b..a49cf35c6 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -59,6 +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 bundle
 
diff --git a/integration/Jenkinsfile b/integration/Jenkinsfile
index ef9d379d9..0bf5175c4 100644
--- a/integration/Jenkinsfile
+++ b/integration/Jenkinsfile
@@ -27,7 +27,6 @@ pipeline {
   }
   post {
     always {
-      sh 'docker-compose -f docker-compose-test.yml run rmt_test SUSEConnect -d'
       sh 'docker-compose -f docker-compose-test.yml down'
       sh 'docker system prune -f'
     }

From 6fed06c6ad7b0c7f1ff1156d4f7649d1230b5353 Mon Sep 17 00:00:00 2001
From: Serhii Kotov <skotov@suse.com>
Date: Fri, 31 Aug 2018 11:39:10 +0200
Subject: [PATCH 4/4] Do not install recommended packages while installing RMT
 in tests

---
 integration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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