Merge branch 'master' into fix-list-extensions-tree

SUSE · Mar 7, 2018 · 7de239a · 7de239a
2 parents 389f518 + 05dddb0
commit 7de239a
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 40 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,42 +1,62 @@
-#!groovy
+pipeline {
+  agent { label "scc-connect" }
 
-node('scc-connect') {
-
-  stage('checkout') {
-    git 'git@github.com:SUSE/connect.git'
+  options {
+    ansiColor('xterm')
   }
 
-  ansiColor('xterm') {
-
-    stage('build docker images') {
-      parallel (
-        build12sp0: { sh 'docker build -t connect.12sp0 -f Dockerfile.12sp0 .' },
-        build12sp1: { sh 'docker build -t connect.12sp1 -f Dockerfile.12sp1 .' },
-        build12sp2: { sh 'docker build -t connect.12sp2 -f Dockerfile.12sp2 .' },
-        build12sp3: { sh 'docker build -t connect.12sp3 -f Dockerfile.12sp3 .' },
-        build15sp0: { sh 'docker build -t connect.15sp0 -f Dockerfile.15sp0 .' }
-      )
+  stages {
+    stage('Checkout') {
+      steps {
+        git 'git@github.com:SUSE/connect.git'
+      }
     }
 
-    stage('unit tests') {
-      parallel (
-        rubocop: { sh 'docker run --rm -t connect.12sp0 rubocop' },
-        rspec_ruby21: { sh 'docker run --rm -t connect.12sp0 rspec' },
-        rspec_ruby25: { sh 'docker run --rm -t connect.15sp0 rspec' }
-      )
-    }
+    stage('Run tests on supported SLE versions') {
+      parallel {
+        stage('SLE12 SP0') {
+          steps {
+            sh 'docker build -t connect.12sp0 -f Dockerfile.12sp0 .'
+            sh 'docker run --rm -t connect.12sp0 rubocop'
+            sh 'docker run --rm -t connect.12sp0 rspec'
+            sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.12sp0 ./docker/integration.sh'
+          }
+        }
+
+        stage('SLE12 SP1') {
+          steps {
+            sh 'docker build -t connect.12sp1 -f Dockerfile.12sp1 .'
+            sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.12sp1 ./docker/integration.sh'
+          }
+        }
 
-    stage('integration tests') {
-      parallel (
-        test12sp0: { sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.12sp0 ./docker/integration.sh' },
-        test12sp1: { sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.12sp1 ./docker/integration.sh' },
-        test12sp2: { sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.12sp2 ./docker/integration.sh' },
-        test12sp3: { sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.12sp3 ./docker/integration.sh' }
-        test15sp0: { sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.15sp0 ./docker/integration.sh' }
-      )
+        stage('SLE12 SP2') {
+          steps {
+            sh 'docker build -t connect.12sp2 -f Dockerfile.12sp2 .'
+            sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.12sp2 ./docker/integration.sh'
+          }
+        }
+
+        stage('SLE12 SP3') {
+          steps {
+            sh 'docker build -t connect.12sp3 -f Dockerfile.12sp3 .'
+            sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.12sp3 ./docker/integration.sh'
+          }
+        }
+
+        stage('SLE15 SP0') {
+          steps {
+            sh 'docker build -t connect.15sp0 -f Dockerfile.15sp0 .'
+            sh 'docker run --rm -t connect.15sp0 rspec'
+            sh 'docker run -v /space/oscbuild:/oscbuild --privileged --rm -t connect.15sp0 ./docker/integration.sh'
+          }
+        }
+      }
     }
+  }
 
-    stage('Clean up docker') {
+  post {
+    always {
       sh 'docker system prune -f'
     }
   }

diff --git a/features/rollback.feature b/features/rollback.feature
@@ -25,8 +25,8 @@ Feature: Rollback registration state to system products
 
   Scenario: Rollback can be called from console with the same outcome as called from library
     When I run `SUSEConnect --rollback`
-
     Then the exit status should be 0
+
     And the output should contain "> Beginning registration rollback. This can take some time..."
     And a file named "/etc/zypp/credentials.d/SCCcredentials" should exist
     And the file "/etc/zypp/credentials.d/SCCcredentials" should contain "SCC_"

diff --git a/features/version.feature b/features/version.feature
@@ -4,5 +4,6 @@ Feature: Version output
 
   Scenario: if version param is passed alone
     Given I run `SUSEConnect --version`
-    Then the output should match /^\d{1,2}\.\d{1,2}\.\d{1,2}$/
+    Then the exit status should be 0
+    And the output should match /^\d{1,2}\.\d{1,2}\.\d{1,2}$/
     And the output should contain exactly current version number
diff --git a/prophet/.prophet_ci.yml b/prophet/.prophet_ci.yml
@@ -1,13 +1,6 @@
 projects:
-
   connect:
-    docker-build-image-sle12sp0: cd ..; docker build -t connect.12sp0 -f Dockerfile.12sp0 .
-    docker-build-image-sle12sp1: cd ..; docker build -t connect.12sp1 -f Dockerfile.12sp1 .
-    docker-build-image-sle12sp2: cd ..; docker build -t connect.12sp2 -f Dockerfile.12sp2 .
     docker-build-image-sle12sp3: cd ..; docker build -t connect.12sp3 -f Dockerfile.12sp3 .
     docker-build-image-sle15sp0: cd ..; docker build -t connect.15sp0 -f Dockerfile.15sp0 .
-    docker-run-tests-sle12sp0: cd ..; docker run --privileged --rm -t connect.12sp0 ./docker/prophet_tests.sh
-    docker-run-tests-sle12sp1: cd ..; docker run --privileged --rm -t connect.12sp1 ./docker/prophet_tests.sh
-    docker-run-tests-sle12sp2: cd ..; docker run --privileged --rm -t connect.12sp2 ./docker/prophet_tests.sh
     docker-run-tests-sle12sp3: cd ..; docker run --privileged --rm -t connect.12sp3 ./docker/prophet_tests.sh
     docker-run-tests-sle15sp0: cd ..; docker run --privileged --rm -t connect.15sp0 ./docker/prophet_tests.sh