clean up ci test config files, fixed artifact naming

Author: jonasjabari

.github/workflows/dockerpush.yml

@@ -9,11 +9,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker-compose run --rm test_6_1_ruby_3_0
+          docker-compose -f ./ci/docker-compose.ci.yml run --rm test_6_1_ruby_3_0
       - name: Upload lock files
         uses: actions/upload-artifact@v2
         with:
-          name: lockfiles
+          name: lockfiles_test_6_1_ruby_3_0
           path: |
             yarn.lock
             Gemfile.lock
@@ -23,11 +23,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker-compose run --rm test_6_1_ruby_2_7
+          docker-compose -f ./ci/docker-compose.ci.yml run --rm test_6_1_ruby_2_7
       - name: Upload lock files
         uses: actions/upload-artifact@v2
         with:
-          name: lockfiles
+          name: lockfiles_test_6_1_ruby_2_7
           path: |
             yarn.lock
             Gemfile.lock
@@ -37,11 +37,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker-compose run --rm test_6_0_ruby_2_6
+          docker-compose -f ./ci/docker-compose.ci.yml run --rm test_6_0_ruby_2_6
       - name: Upload lock files
         uses: actions/upload-artifact@v2
         with:
-          name: lockfiles
+          name: lockfiles_test_6_0_ruby_2_6
           path: |
             yarn.lock
             Gemfile.lock
@@ -51,11 +51,11 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker-compose run --rm test_5_2_ruby_2_6
+          docker-compose -f ./ci/docker-compose.ci.yml run --rm test_5_2_ruby_2_6
       - name: Upload lock files
         uses: actions/upload-artifact@v2
         with:
-          name: lockfiles
+          name: lockfiles_test_5_2_ruby_2_6
           path: |
             yarn.lock
             Gemfile.lock

Dockerfile.test_5_2_ruby_2_6 renamed to ci/Dockerfile.test_5_2_ruby_2_6

@@ -10,7 +10,7 @@ WORKDIR /app
 
 COPY ./lib/ /app/lib/
 COPY matestack-ui-core.gemspec /app/
-COPY Gemfile.5.2 /app/Gemfile
+COPY ./ci/Gemfile.5.2 /app/Gemfile
 RUN bundle install
 
 COPY package.json /app/
@@ -34,11 +34,14 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
 
 RUN mv Gemfile _Gemfile
 RUN mv Gemfile.lock _Gemfile.lock
+RUN mv yarn.lock _yarn.lock
 COPY . /app
 RUN rm Gemfile
 RUN rm Gemfile.lock
+RUN rm yarn.lock
 RUN mv _Gemfile Gemfile
 RUN mv _Gemfile.lock Gemfile.lock
+RUN mv _yarn.lock yarn.lock
 
 RUN rm /app/spec/dummy/db/schema.rb
 

Dockerfile.test_6_0_ruby_2_6 renamed to ci/Dockerfile.test_6_0_ruby_2_6

@@ -10,7 +10,7 @@ WORKDIR /app
 
 COPY ./lib/ /app/lib/
 COPY matestack-ui-core.gemspec /app/
-COPY Gemfile.6.0 /app/Gemfile
+COPY ./ci/Gemfile.6.0 /app/Gemfile
 RUN bundle install
 
 COPY package.json /app/
@@ -34,11 +34,14 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
 
 RUN mv Gemfile _Gemfile
 RUN mv Gemfile.lock _Gemfile.lock
+RUN mv yarn.lock _yarn.lock
 COPY . /app
 RUN rm Gemfile
 RUN rm Gemfile.lock
+RUN rm yarn.lock
 RUN mv _Gemfile Gemfile
 RUN mv _Gemfile.lock Gemfile.lock
+RUN mv _yarn.lock yarn.lock
 
 RUN rm /app/spec/dummy/db/schema.rb
 

Dockerfile.test_6_1_ruby_2_7 renamed to ci/Dockerfile.test_6_1_ruby_2_7

@@ -10,7 +10,7 @@ WORKDIR /app
 
 COPY ./lib/ /app/lib/
 COPY matestack-ui-core.gemspec /app/
-COPY Gemfile.6.1 /app/Gemfile
+COPY ./ci/Gemfile.6.1 /app/Gemfile
 RUN bundle install
 
 COPY package.json /app/
@@ -34,11 +34,14 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
 
 RUN mv Gemfile _Gemfile
 RUN mv Gemfile.lock _Gemfile.lock
+RUN mv yarn.lock _yarn.lock
 COPY . /app
 RUN rm Gemfile
 RUN rm Gemfile.lock
+RUN rm yarn.lock
 RUN mv _Gemfile Gemfile
 RUN mv _Gemfile.lock Gemfile.lock
+RUN mv _yarn.lock yarn.lock
 
 RUN rm /app/spec/dummy/db/schema.rb
 

Dockerfile.test_6_1_ruby_3_0 renamed to ci/Dockerfile.test_6_1_ruby_3_0

@@ -10,7 +10,7 @@ WORKDIR /app
 
 COPY ./lib/ /app/lib/
 COPY matestack-ui-core.gemspec /app/
-COPY Gemfile.6.1 /app/Gemfile
+COPY ./ci/Gemfile.6.1 /app/Gemfile
 RUN bundle install
 
 COPY package.json /app/
@@ -34,11 +34,15 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
 
 RUN mv Gemfile _Gemfile
 RUN mv Gemfile.lock _Gemfile.lock
+RUN mv yarn.lock _yarn.lock
 COPY . /app
 RUN rm Gemfile
 RUN rm Gemfile.lock
+RUN rm yarn.lock
 RUN mv _Gemfile Gemfile
 RUN mv _Gemfile.lock Gemfile.lock
+RUN mv _yarn.lock yarn.lock
+
 
 RUN rm /app/spec/dummy/db/schema.rb
 

Gemfile.5.2 renamed to ci/Gemfile.5.2

@@ -0,0 +1,67 @@
+version: '3'
+services:
+
+  test_5_2_ruby_2_6:
+    build:
+      context: ../
+      dockerfile: ./ci/Dockerfile.test_5_2_ruby_2_6
+    environment:
+      RAILS_ENV: test
+    links:
+      - "postgres_test_5_2_ruby_2_6:postgres_test"
+    command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test"
+    user: ${CURRENT_UID}
+
+  test_6_0_ruby_2_6:
+    build:
+      context: ../
+      dockerfile: ./ci/Dockerfile.test_6_0_ruby_2_6
+    environment:
+      RAILS_ENV: test
+    links:
+      - "postgres_test_6_0_ruby_2_6:postgres_test"
+    command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test"
+    user: ${CURRENT_UID}
+
+  test_6_1_ruby_2_7:
+    build:
+      context: ../
+      dockerfile: ./ci/Dockerfile.test_6_1_ruby_2_7
+    environment:
+      RAILS_ENV: test
+    links:
+      - "postgres_test_6_1_ruby_2_7:postgres_test"
+    command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test"
+    user: ${CURRENT_UID}
+
+  test_6_1_ruby_3_0:
+    build:
+      context: ../
+      dockerfile: ./ci/Dockerfile.test_6_1_ruby_3_0
+    environment:
+      RAILS_ENV: test
+    links:
+      - "postgres_test_6_1_ruby_3_0:postgres_test"
+    command: sh -c "bundle exec rake db:drop && bundle exec rake db:create && bundle exec rake db:migrate && bundle exec rspec spec/test"
+    user: ${CURRENT_UID}
+
+  postgres_test_base: &postgres_test_base
+    image: postgres
+    expose:
+      - 5432
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: test
+
+  postgres_test_6_1_ruby_3_0:
+    <<: *postgres_test_base
+
+  postgres_test_6_1_ruby_2_7:
+    <<: *postgres_test_base
+
+  postgres_test_6_0_ruby_2_6:
+    <<: *postgres_test_base
+
+  postgres_test_5_2_ruby_2_6:
+    <<: *postgres_test_base

Gemfile.6.0 renamed to ci/Gemfile.6.0

@@ -53,7 +53,7 @@ services:
   test_5_2_ruby_2_6:
     build:
       context: .
-      dockerfile: ./Dockerfile.test_5_2_ruby_2_6
+      dockerfile: ./ci/Dockerfile.test_5_2_ruby_2_6
     environment:
       RAILS_ENV: test
     links:
@@ -64,7 +64,7 @@ services:
   test_6_0_ruby_2_6:
     build:
       context: .
-      dockerfile: ./Dockerfile.test_6_0_ruby_2_6
+      dockerfile: ./ci/Dockerfile.test_6_0_ruby_2_6
     environment:
       RAILS_ENV: test
     links:
@@ -75,7 +75,7 @@ services:
   test_6_1_ruby_2_7:
     build:
       context: .
-      dockerfile: ./Dockerfile.test_6_1_ruby_2_7
+      dockerfile: ./ci/Dockerfile.test_6_1_ruby_2_7
     environment:
       RAILS_ENV: test
     links:
@@ -86,7 +86,7 @@ services:
   test_6_1_ruby_3_0:
     build:
       context: .
-      dockerfile: ./Dockerfile.test_6_1_ruby_3_0
+      dockerfile: ./ci/Dockerfile.test_6_1_ruby_3_0
     environment:
       RAILS_ENV: test
     links: