Specify custom docker executor instead of one coming from the orb

samvera · Nov 5, 2021 · 2ca9d6d · 2ca9d6d
1 parent efb15b8
commit 2ca9d6d
Showing 1 changed file with 40 additions and 20 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,9 +1,12 @@
 version: 2.1
 orbs:
-  samvera: samvera/circleci-orb@0
+  samvera: samvera/circleci-orb@1
 jobs:
   bundle_lint_test:
     parameters:
+      ruby_type:
+        type: string
+        default: 'ruby'
       ruby_version:
         type: string
       bundler_version:
@@ -14,12 +17,28 @@ jobs:
       solr_config_path:
         type: string
         default: lib/generators/active_fedora/config/solr/templates/solr/conf
-    executor:
-      name: 'samvera/ruby_fcrepo_solr'
-      ruby_version: << parameters.ruby_version >>
-      fcrepo_version: '5.1.0'
-    environment:
-      RAILS_VERSION: << parameters.rails_version >>
+      solr_port:
+        type: string
+        default: '8983'
+    docker:
+      - image: circleci/<< parameters.ruby_type >>:<< parameters.ruby_version >>-node-browsers-legacy
+        environment:
+          BUNDLE_PATH: vendor/bundle
+          BUNDLE_JOBS: 4
+          BUNDLE_RETRY: 3
+          RAILS_ENV: test
+          RACK_ENV: test
+          SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
+          RAILS_VERSION: << parameters.rails_version >>
+          FCREPO_PORT: 8080
+          FCREPO_REST_PATH: fcrepo/rest
+          SOLR_TEST_PORT: << parameters.solr_port >>
+      - image: fcrepo/fcrepo:6.1.0
+        environment:
+          JAVA_OPTS: -Dfcrepo.autoversioning.enabled=false -Dfcrepo.external.content.allowed=/fcrepo_allow.txt
+        entrypoint: echo "http://fedoraAdmin:fedoraAdmin@localhost:8080/" > /fcrepo_allow.txt
+      - image: solr:slim
+        command: bin/solr -cloud -noprompt -f -p <<parameters.solr_port>>
     steps:
       - samvera/cached_checkout
       - checkout
@@ -40,6 +59,7 @@ jobs:
 
       - samvera/install_solr_core:
           solr_config_path: << parameters.solr_config_path >>
+          solr_port: <<parameters.solr_port >>
 
       - samvera/rubocop
 
@@ -50,29 +70,29 @@ workflows:
     jobs:
       - bundle_lint_test:
           name: ruby2-7_rails5-2
-          ruby_version: 2.7.0
-          rails_version: 5.2.4
+          ruby_version: 2.7.4
+          rails_version: 5.2.6
       - bundle_lint_test:
           name: ruby2-6_rails5-2
-          ruby_version: 2.6.5
-          rails_version: 5.2.4
+          ruby_version: 2.6.8
+          rails_version: 5.2.6
       - bundle_lint_test:
           name: ruby2-5_rails5-2
-          ruby_version: 2.5.7
-          rails_version: 5.2.4
+          ruby_version: 2.5.9
+          rails_version: 5.2.6
       - bundle_lint_test:
           name: ruby2-4_rails5-2
-          ruby_version: 2.4.9
-          rails_version: 5.2.4
+          ruby_version: 2.4.10
+          rails_version: 5.2.6
       - bundle_lint_test:
           name: ruby2-7_rails6-0
           ruby_version: 2.7.0
-          rails_version: 6.0.2
+          rails_version: 6.0.4
       - bundle_lint_test:
           name: ruby2-6_rails6-0
-          ruby_version: 2.6.5
-          rails_version: 6.0.2
+          ruby_version: 2.6.8
+          rails_version: 6.0.4
       - bundle_lint_test:
           name: ruby2-5_rails6.0
-          ruby_version: 2.5.7
-          rails_version: 6.0.2
+          ruby_version: 2.5.9
+          rails_version: 6.0.4