Merging steps

.gitlab-ci.yml

@@ -1,16 +1,19 @@
 ---
 
-stages:
-  - build
-  - test
-
 build:
-  stage: build
 
   tags:
   - ruby
   - stretch
 
+  variables:
+    POSTGRES_DB: debshots_test
+    POSTGRES_USER: debshots
+    POSTGRES_PASSWORD: ""
+
+  services:
+  - postgres:latest
+
   cache:
     key: build-cache
     paths:
@@ -21,28 +24,6 @@ build:
   - apt-get -o dir::cache::archives="vendor/apt" install -yqq imagemagick git build-essential zlib1g-dev libbz2-dev libpq-dev postgresql
     #- gem install bundler --no-ri --no-rdoc
   - RAILS_ENV=test bundle install --path vendor
-
-test:
-  stage: test
-
-  tags:
-  - ruby
-  - stretch
-
-  cache:
-    key: build-cache
-    paths:
-    - vendor/
-
-  variables:
-    POSTGRES_DB: debshots_test
-    POSTGRES_USER: debshots
-    POSTGRES_PASSWORD: ""
-
-  services:
-  - postgres:latest
-
-  script:
   - cp config/database.yml.gitlab config/database.yml
   - RAILS_ENV=test bundle exec rake db:create db:schema:load
   - bundle exec rake test