hyrax 4.0.0.rc3 → 5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d9595ce45877e35b01b14d36cdefb89a1bb8978ab424bbe9907edcfebb693e
-  data.tar.gz: 516c7de64fc06ede1b8bd0843ad4ad98b01d39f7440c4723e72235880d52d34a
+  metadata.gz: 136cdda4fa63bf4027c7df373f2bf769221e5d0f9a16811ff75e3a2e7e791f9c
+  data.tar.gz: dc26381d252dc0d89c3ffce60341c906249b57107a812a219b4c6b81801a2035
 SHA512:
-  metadata.gz: 7a4173fac3ac9ee096966e8019d7bbb00e80715b1a7672fd830920229b6236cd31b63c3099992137d107f47ef4a863db2137607c8f86f094bcd981e90443ac38
-  data.tar.gz: 8fe124964ed3356cbb93bf5db4d1d491d8927020dce6226c0046a8068504ea21b427b99a25fd48b81b7b36ebc1702a23479ce4fe89189d4851551d5e703aa8c2
+  metadata.gz: 64629a2c0467415e4d8a5339f15932bcec06bc191cf269733be1f223a2a62129f3e997813cc7ed1572cb7824d31254a538e76510230554dc55d07c3fd701b0f0
+  data.tar.gz: 50df342a224686ca14a60886b14b3154bc0de8e78c73d99099377c81d63be0a33ee4a00f635a65917e462df2a5192e516740231b446671f3b72bdb379975d8e8

data/.circleci/config.yml

@@ -5,271 +5,156 @@ orbs:
   ruby: circleci/ruby@2
   node: circleci/node@5
 
-jobs:
-  bundle:
+executors:
+  hyrax:
     parameters:
+      fcrepo_version:
+        type: string
+        default: '4.7.5'
+      hyrax_app:
+        type: string
+        default: 'dassie'
+      postgres_version:
+        type: string
+        default: '14.9'
+      redis_version:
+        type: string
+        default: '6.2'
+      ruby_type:
+        type: string
+        default: 'ruby'
       ruby_version:
         type: string
-        default: 2.7.7
-      bundler_version:
+        default: '2.5.5'
+      solr_port:
         type: string
-        default: 2.4.8
-      rails_version:
+        default: '8985'
+      solr_version:
         type: string
-        default: 6.1.7.2
-    executor:
-      name: 'samvera/ruby'
-      ruby_version: << parameters.ruby_version >>
-    resource_class: medium
+        default: '8.11-slim'
     environment:
-      RAILS_VERSION: << parameters.rails_version >>
-      NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-    steps:
-      - samvera/cached_checkout
-
-      - run:
-          name: Check for a branch named 'master'
-          command: |
-            git fetch --all --quiet --prune --prune-tags
-            if [[ -n "$(git branch --all --list master */master)" ]]; then
-              echo "A branch named 'master' was found. Please remove it."
-              echo "$(git branch --all --list master */master)"
-            fi
-            [[ -z "$(git branch --all --list master */master)" ]]
+      RAILS_ENV: test
+      RACK_ENV: test
+      FCREPO_PORT: 8080
+      POSTGRES_DB: circle_test
+      POSTGRES_HOST: 127.0.0.1
+      POSTGRES_USER: postgres
+    docker:
+      - image: "ghcr.io/samvera/hyrax/<< parameters.hyrax_app >>-dev:<< pipeline.git.revision >>"
+      - image: seleniarm/standalone-chromium:114.0
+        environment:
+          SE_NODE_SESSION_TIMEOUT: 1200
+          START_XVFB: "false"
 
-      - samvera/bundle:
-          ruby_version: << parameters.ruby_version >>
-          bundler_version: << parameters.bundler_version >>
+      - image: samvera/fcrepo4:<< parameters.fcrepo_version >>
+        environment:
+          CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
+      - image: zookeeper:3.4
+      - image: solr:<< parameters.solr_version >>
+        environment:
+          VERBOSE: yes
+          SECURITY_JSON: '{"authentication":{"blockUnknown": false, "class":"solr.BasicAuthPlugin", "credentials":{"solr":"IV0EHq1OnNrj6gvRCwvFwTrZ1+z1oBbnQdiVC3otuq0= Ndd7LKvVBAaZIF0QAVi1ekCfAJXr1GGfLtRUXhgrF8c="}, "realm":"My Solr users", "forwardCredentials": false}, "authorization":{ "class":"solr.RuleBasedAuthorizationPlugin", "permissions":[{"name":"security-edit", "role":"admin"}], "user-role":{"solr":"admin"}}}'
+        command: sh -c "server/scripts/cloud-scripts/zkcli.sh -zkhost localhost:2181 -cmd put /security.json \"${SECURITY_JSON}\" && solr-fg -cloud -noprompt  -p << parameters.solr_port >> -z localhost:2181"
+      - image: redis:<< parameters.redis_version >>
+      - image: cimg/postgres:<< parameters.postgres_version >>
 
-      # Run rubocop in parallel with caching
-      # This should get added to the orb once proven here
-
-      - restore_cache:
-          name: Restore rubocop cache
-          keys:
-            - v1-rubocop-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
-            - v1-rubocop-ruby<< parameters.ruby_version >>
-            - v1
-
-      - run:
-          name: Run rubocop in parallel
-          command: bundle exec rubocop --parallel
-
-      - save_cache:
-          name: Save rubocop cache
-          key: v1-rubocop-ruby<< parameters.ruby_version >>-bundle{{ checksum "Gemfile.lock" }}
-          paths:
-            - ~/.cache/rubocop_cache
-
-      - persist_to_workspace:
-          root: ~/
-          paths:
-          - project/*
-          - project/**/*
-
-  build:
+jobs:
+  kaniko-build:
     parameters:
-      ruby_version:
-        type: string
-        default: 2.7.7
-      bundler_version:
+      hyrax_app:
         type: string
-        default: 2.4.8
-      rails_version:
+        default: dassie
+      ruby_version:
         type: string
-        default: 6.1.7.2
-    executor:
-      name: 'samvera/ruby_fcrepo_solr_redis_postgres'
-      ruby_version: << parameters.ruby_version >>
-    resource_class: medium
-    environment:
-      RAILS_VERSION: << parameters.rails_version >>
-      NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-      ENGINE_CART_RAILS_OPTIONS: --database=postgresql --skip-git --skip-bundle --skip-listen --skip-spring --skip-keeps --skip-test --skip-bootsnap --skip-javascript
-      DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
+        default: 3.2.2
+    docker:
+      - image: gcr.io/kaniko-project/executor:v1.14.0-debug
+        entrypoint: ""
     steps:
-      - attach_workspace:
-          at: ~/
-      - samvera/engine_cart_generate:
-          cache_key: v1-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-{{ checksum ".circleci/config.yml" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
-      - samvera/bundle:
-          ruby_version: << parameters.ruby_version >>
-          bundler_version: << parameters.bundler_version >>
       - run:
-          name: Generate .internal_test_app/Gemfile.lock
-          command: bundle lock
-          working_directory: .internal_test_app
-      - ruby/install-deps:
-          app-dir: .internal_test_app
-      - node/install-packages:
-          pkg-manager: yarn
-          app-dir: .internal_test_app
-      - persist_to_workspace:
-          root: ~/
-          paths:
-          - project/*
-          - project/**/*
+          name: Configure GHCR credentials
+          command: |
+             cat > /kaniko/.docker/config.json \<<- JSON
+             {
+               "auths": {
+                 "ghcr.io": {
+                   "auth": "$(echo -n $GHCR_USER:$GHCR_TOKEN | base64)"
+                 }
+               }
+             }
+             JSON
+      - run:
+          name: Build and Push image
+          command: |
+            /kaniko/executor \
+                --cache=true \
+                --build-arg "EXTRA_APK_PACKAGES=git bash" \
+                --build-arg "APP_PATH=.<< parameters.hyrax_app >>" \
+                --build-arg "RUBY_VERSION=<< parameters.ruby_version >>" \
+                --context "git://github.com/samvera/hyrax#refs/heads/${CIRCLE_BRANCH}#${CIRCLE_SHA1}" \
+                --target "hyrax-engine-dev" \
+                --destination "ghcr.io/samvera/hyrax/<< parameters.hyrax_app >>-dev:${CIRCLE_SHA1}"
 
-  test:
+  hyrax-test:
     parameters:
-      ruby_version:
-        type: string
-        default: 2.7.7
-      bundler_version:
+      hyrax_app:
         type: string
-        default: 2.4.8
+        default: dassie
       hyrax_valkyrie:
         type: string
         default: "false"
+      ruby_version:
+        type: string
+        default: 3.2.2
     executor:
-      name: 'samvera/ruby_fcrepo_solr_redis_postgres'
+      name: hyrax
+      hyrax_app: << parameters.hyrax_app >>
       ruby_version: << parameters.ruby_version >>
-    resource_class: medium+
-    parallelism: 10
+    resource_class: large
+    parallelism: 12
     environment:
+      CHROME_HEADLESS_MODE: true
+      DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test
+      HUB_URL: http://localhost:4444/wd/hub
       HYRAX_VALKYRIE: << parameters.hyrax_valkyrie >>
+      IN_DOCKER: true
+      KARMA_BROWSER: remote-chromium
+      VALKYRIE_SOLR_CORE: valkyrie-test
       VALKYRIE_SOLR_PORT: 8985
-      DATABASE_URL: postgresql://postgres@127.0.0.1/circle_test # Hard-coded with data from CircleCI orb, related to https://github.com/samvera-labs/samvera-circleci-orb/issues/42
-      KARMA_BROWSER: ChromeHeadlessCustom
-      RAILS_ROOT: .internal_test_app
-      SPEC_OPTS: "" # Clear output conflicts between samvera orb executor and ruby orb rspec command
     steps:
-      - attach_workspace:
-          at: ~/
       - run:
-          name: Install system dependencies
-          command: |
-            sudo apt-get update
-            sudo apt-get install imagemagick librsvg2-bin lsof
-      - browser-tools/install-chrome
-      - browser-tools/install-chromedriver
+          name: yarn
+          command: cd /app/samvera/hyrax-engine && yarn
       - run:
-          name: Check Chrome install
+          name: Create solr core
           command: |
-            google-chrome --version
-            chromedriver --version
-      - restore_cache:
-          keys:
-            - engine-node-v1-{{ checksum "package.json" }}
-      # Call yarn directly for hyrax engine; node orb demands a lockfile to use caching
-      - run:
-          name: Yarn Install (engine)
-          command: yarn install
-      - save_cache:
-          key: engine-node-v1-{{ checksum "package.json" }}
-          paths:
-            - node_modules
-      - samvera/install_solr_core:
-          solr_config_path: .internal_test_app/solr/conf
-      - samvera/install_solr_core:
-          solr_config_path: .internal_test_app/solr/conf
-          core_name: hyrax-valkyrie-test
-      # Rerun bundler in case this is a different ruby version than bundle and build steps
-      - samvera/bundle:
-          ruby_version: << parameters.ruby_version >>
-          bundler_version: << parameters.bundler_version >>
-      # Ensure gems needed by the test app are installed
-      - ruby/install-deps:
-          app-dir: .internal_test_app
-      - node/install-packages:
-          pkg-manager: yarn
-          app-dir: .internal_test_app
-      - run:
-          command: bundle exec rake db:migrate
-          working_directory: .internal_test_app
-      - ruby/rspec-test
-      - store_artifacts:
-          path: Gemfile.lock
-          destination: engine-gemfile-lock
-      - store_artifacts:
-          path: .internal_test_app/Gemfile.lock
-          destination: webapp-gemfile-lock
+            cd /app/samvera/hyrax-webapp/solr/conf
+            zip -1 -r solr_conf.zip ./*
+            db-wait.sh localhost:8985 # wait for solr to be available before hitting the API
+            curl -H "Content-type:application/octet-stream" --data-binary @solr_conf.zip "http://solr:SolrRocks@127.0.0.1:8985/solr/admin/configs?action=UPLOAD&name=solrconfig"
+            curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8985/api/collections/ -d '{create: {name: hydra-test, config: solrconfig, numShards: 1}}'
+            curl -H 'Content-type: application/json' http://solr:SolrRocks@127.0.0.1:8985/api/collections/ -d '{create: {name: valkyrie-test, config: solrconfig, numShards: 1}}'
+      - ruby/rspec-test:
+          app-dir: /app/samvera/hyrax-engine
 
 workflows:
   version: 2
-  ruby3-2:
+  dassie:
     jobs:
-      - bundle:
+      - kaniko-build:
+          name: "dassie-build"
           ruby_version: "3.2.2"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-      - build:
+          hyrax_app: "dassie"
+      - hyrax-test:
+          name: "dassie-test"
           ruby_version: "3.2.2"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
+          hyrax_app: "dassie"
           requires:
-            - bundle
-      - test:
-          name: "ruby3-2"
+            - dassie-build
+      - hyrax-test:
+          name: "dassie-valkyrie-test"
           ruby_version: "3.2.2"
-          bundler_version: "2.4.8"
-          requires:
-            - build
-      - test:
-          name: "ruby3-2-valkyrie"
-          ruby_version: "3.2.2"
-          bundler_version: "2.4.8"
-          hyrax_valkyrie: "true"
-          requires:
-            - build
-  ruby3-1:
-    jobs:
-      - bundle:
-          ruby_version: "3.1.4"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-      - build:
-          ruby_version: "3.1.4"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-          requires:
-            - bundle
-      - test:
-          name: "ruby3-1"
-          ruby_version: "3.1.4"
-          bundler_version: "2.4.8"
-          requires:
-            - build
-  ruby3-0:
-    jobs:
-      - bundle:
-          ruby_version: "3.0.6"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-      - build:
-          ruby_version: "3.0.6"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-          requires:
-            - bundle
-      - test:
-          name: "ruby3-0"
-          ruby_version: "3.0.6"
-          bundler_version: "2.4.8"
-          requires:
-            - build
-  ruby2-7:
-    jobs:
-      - bundle:
-          ruby_version: "2.7.7"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-      - build:
-          ruby_version: "2.7.7"
-          rails_version: "6.1.7.2"
-          bundler_version: "2.4.8"
-          requires:
-            - bundle
-      - test:
-          name: "ruby2-7"
-          ruby_version: "2.7.7"
-          bundler_version: "2.4.8"
-          requires:
-            - build
-      - test:
-          name: "ruby2-7-valkyrie"
-          ruby_version: "2.7.7"
-          bundler_version: "2.4.8"
-          hyrax_valkyrie: "true"
+          hyrax_app: "dassie"
+          hyrax_valkyrie: "1"
           requires:
-            - build
+            - dassie-build

data/.dassie/.env

@@ -9,6 +9,7 @@ FCREPO_HOST=fcrepo
 FCREPO_PORT=8080
 FCREPO_REST_PATH=rest
 FCREPO_TEST_BASE_PATH=/test
+FITS_SERVLET_URL=http://fits:8080/fits
 HUB_URL=http://chrome:4444/wd/hub
 HYRAX_ANALYTICS=false
 HYRAX_ANALYTICS_PROVIDER=google
@@ -16,7 +17,8 @@ HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
 HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
 HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
 IN_DOCKER=true
-KARMA_BROWSER=ChromiumHeadlessCustom
+KARMA_BROWSER=remote-chromium
+KARMA_HOSTNAME=app
 MEMCACHED_HOST=memcached
 RACK_ENV=development
 RAILS_ENV=development

data/.dassie/Gemfile

@@ -8,8 +8,6 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.2.1'
-
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0'
 # Use postgresql as the database for Active Record

data/.dassie/config/analytics.yml

@@ -3,11 +3,11 @@ analytics:
     analytics_id: <%= ENV['GOOGLE_ANALYTICS_ID'] %>
     app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME'] %>
     app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION'] %>
+    privkey_value: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_VALUE'] %>
     privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH'] %>
     privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET'] %>
     client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL'] %>
-  matomo: 
+  matomo:
     base_url: <%= ENV['MATOMO_BASE_URL'] %>
     site_id: <%= ENV['MATOMO_SITE_ID'] %>
     auth_token: <%= ENV['MATOMO_AUTH_TOKEN'] %>
-    

data/.dassie/config/environments/test.rb

@@ -2,6 +2,7 @@ require 'hyrax/specs/disable_animations_in_test_environment'
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
+  config.assets.debug = true
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that

data/.dassie/config/initializers/hyrax.rb

@@ -18,6 +18,8 @@ Hyrax.config do |config|
   config.work_requires_files = false
   config.citations = true
 
+  config.characterization_options = { ch12n_tool: ENV.fetch('CH12N_TOOL', 'fits').to_sym }
+
   # Returns a URL that resolves to an image provided by a IIIF image server
   config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|
     Riiif::Engine.routes.url_helpers.image_url(file_id, host: base_url, size: size)
@@ -40,7 +42,7 @@ Hyrax.config do |config|
     config.browse_everything = nil
   end
 
-  # config.geonames_username = ''
+  config.geonames_username = ENV['GEONAMES_USERNAME'] || ''
 
   ##
   # Set the system-wide virus scanner

data/.dassie/config/initializers/redis_config.rb

@@ -2,7 +2,6 @@
 require 'redis'
 require 'connection_pool'
 config = YAML.safe_load(ERB.new(IO.read(Rails.root.join('config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-config[:thread_safe] = true
 
 size = ENV.fetch("HYRAX_REDIS_POOL_SIZE", 5)
 timeout = ENV.fetch("HYRAX_REDIS_TIMEOUT", 5)

data/.dassie/config/initializers/riiif.rb

@@ -14,9 +14,19 @@ ActiveSupport::Reloader.to_prepare do
     { height: doc['height_is'], width: doc['width_is'], format: doc['mime_type_ssi'], channels: doc['alpha_channels_ssi'] }
   end
 
-  Riiif::Image.file_resolver.id_to_uri = lambda do |id|
-    Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
-      Rails.logger.info "Riiif resolved #{id} to #{url}"
+  if Hyrax.config.use_valkyrie?
+    # Use Valkyrie adapter to make sure file is available locally. Riiif will just open it then
+    # id comes in with the format "FILE_SET_ID/files/FILE_ID"
+    Riiif::Image.file_resolver.id_to_uri = lambda do |id|
+      file_metadata = Hyrax.query_service.find_by(id: id.split('/').last)
+      file = Hyrax.storage_adapter.find_by(id: file_metadata.file_identifier)
+      file.disk_path.to_s
+    end
+  else
+    Riiif::Image.file_resolver.id_to_uri = lambda do |id|
+      Hyrax::Base.id_to_uri(CGI.unescape(id)).tap do |url|
+        Rails.logger.info "Riiif resolved #{id} to #{url}"
+      end
     end
   end
 

data/.dassie/db/schema.rb

@@ -2,8 +2,8 @@
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# This file is the source Rails uses to define your schema when running `rails
-# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# This file is the source Rails uses to define your schema when running `bin/rails
+# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.

data/.dockerignore

@@ -7,9 +7,15 @@ Dockerfile
 
 *.rdb
 
+.circleci/*
+.github/*
+
 artifacts/*
 coverage/*
 chart/*
 
 Gemfile.lock
 .dassie/Gemfile.lock
+
+node_modules/*
+yarn.lock

data/.github/ISSUE_TEMPLATE.md

@@ -1,20 +1,25 @@
 ### Descriptive summary
 
-Include what version of Hyrax relates to this issue (7.x, 6.x, HEAD, etc.) if appropriate, and any relevant tracebacks if you're reporting a bug.
+Present tense short summary (30 words or less)
 
-### Rationale
+### Steps to reproduce the behavior in User Interface (UI)
 
-Provide the rationale or user story that describes "why" this issue should be addressed. Especially if this is a new feature or significant change to the existing implementation.
+1. Do this
+2. Then do this...
+3. Include note here if not testable in UI
 
-### Expected behavior
+### Actual behavior (include screenshots if available)
 
-### Actual behavior
+Include what version of Hyrax relates to this issue (3.x, 4.x, main branch, etc.) if appropriate, and any relevant error messages/tracebacks if you're reporting a bug.
 
-### Steps to reproduce the behavior
+### Acceptance Criteria/Expected Behavior
 
-1. Do this
-2. Then do this...
+- [ ] Create checkbox list of what done looks like...
+
+### Rationale (for feature request only)
+
+Provide the rationale or user story that describes "why" this issue should be addressed. Especially if this is a new feature or significant change to the existing implementation.
 
 ### Related work
 
-Link to related tickets or prior related work here.
+Link to related issues or prior related work here.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,31 @@
+### Fixes
+
 Fixes #issuenumber ; refs #issuenumber
 
+### Summary
+
 Present tense short summary (50 characters or less)
 
+### Guidance for testing, such as acceptance criteria or new user interface behaviors:
+*
+*
+*
+
+### Type of change (for release notes)
+
+Add an appropriate `notes-*` label to the PR (or indicate here) that classifies this change.
+
+Choose from:
+- `notes-major` Major Changes (Potentially breaking changes)
+- `notes-minor` New Features that are backward compatible
+- `notes-deprecation` Deprecations
+- `notes-bugfix` Bug Fixes
+- `notes-valkyrie` Valkyrie Progress
+- `notes-docs` Documentation
+- `notes-container` Containerization related (Docker, Helm, etc)
+
+### Detailed Description
+
 More detailed description, if necessary. Try to be as descriptive as you can: even if you think that the PR content is obvious, it may not be obvious to others. Include tracebacks if helpful, and be sure to call out any bits of the PR that may be work-in-progress.
 
 Description can have multiple paragraphs and you can use code examples inside:
@@ -14,12 +38,7 @@ class PostsController
 end
 ```
 
-Changes proposed in this pull request:
-*
-*
-*
-
-Guidance for testing, such as acceptance criteria or new user interface behaviors:
+### Changes proposed in this pull request:
 *
 *
 *

data/.github/release.yml

@@ -3,10 +3,10 @@ changelog:
     - title: Major Changes (Potentially breaking changes)
       labels:
         - notes-major
-    - title: New Features
+    - title: New Features and Non-breaking Changes
       labels:
         - notes-minor
-    - title: Deprecations
+    - title: Deprecation Notices
       labels:
         - notes-deprecation
     - title: Bug Fixes
@@ -21,6 +21,9 @@ changelog:
     - title: Containerization
       labels:
         - notes-container
+    - title: Tests and CI Process
+      labels:
+        - notes-tests
     - title: Other
       labels:
         - "*"

data/.koppie/.env

@@ -7,12 +7,15 @@ DB_NAME=koppie
 DB_PASSWORD=hyrax_password
 DB_PORT=5432
 DB_USERNAME=hyrax_user
+FITS_SERVLET_URL=http://fits:8080/fits
 HUB_URL=http://chrome:4444/wd/hub
 HYRAX_DERIVATIVES_PATH=/app/samvera/hyrax-webapp/derivatives/
 HYRAX_ENGINE_PATH=/app/samvera/hyrax-engine
 HYRAX_UPLOAD_PATH=/app/samvera/hyrax-webapp/uploads/
 HYRAX_VALKYRIE=true
 IN_DOCKER=true
+KARMA_BROWSER=remote-chromium
+KARMA_HOSTNAME=app
 METADATA_DATABASE_NAME=koppie_metadata_development
 POSTGRES_DB=koppie
 POSTGRES_HOST_AUTH_METHOD=trust

data/.koppie/Gemfile

@@ -6,8 +6,6 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.7'
-
 gem 'bootsnap', '>= 1.1.0', require: false
 gem 'bootstrap', '~> 4.0'
 gem 'coffee-rails', '~> 4.2'