Small cleanup to exitcode logic

Author: kpaulisse

script/cibuild

@@ -100,7 +100,7 @@ if [ "$RSPEC_TEST" = "true" ]; then
 
     # Run the tests
     echo "Running rspec unit tests"
-    time bundle exec rake spec:spec
+    time bundle exec rspec "${DIR}/spec/octocatalog-diff/tests"
     exitcode=$?
     if [ "$exitcode" -ne 0 ]; then RSPEC_EXITCODE="$exitcode"; fi
     cat "$OUTPUT_FILE"
@@ -112,7 +112,6 @@ if [ "$RSPEC_TEST" = "true" ]; then
     echo "Running rspec integration tests"
     for file in "${DIR}"/spec/octocatalog-diff/integration/*_spec.rb; do
       retry=1
-      exitcode=255
       for try in 1 2 3 ; do
         if [ $retry -eq 1 ]; then
           retry=0
@@ -123,11 +122,12 @@ if [ "$RSPEC_TEST" = "true" ]; then
             RSPEC_EXITCODE="255"
           elif [ $exitcode -eq 124 ] && [ $try -lt 3 ]; then
             retry=1
+          elif [ $exitcode -ne 0 ]; then
+            RSPEC_EXITCODE="$exitcode"
           fi
         fi
       done
 
-      if [ "$exitcode" -ne 0 ]; then RSPEC_EXITCODE="$exitcode"; fi
       cat "$OUTPUT_FILE"
     done
   done