upgrade to use 3.1 build (#134)

* use 3.1 packaging

* use psych < 4 for compatability

Author: johrstrom

.gitlab-ci.yml

@@ -4,7 +4,7 @@ variables:
   OOD_PACKAGING_DEBUG: 'true'
   OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec
   OOD_PACKAGING_GPG_PASSPHRASE: /systems/osc_certs/gpg/ondemand/.gpgpass
-  OOD_PACKAGING_RELEASE: '2.1'
+  OOD_PACKAGING_RELEASE: '3.1'
 
 before_script:
   - docker info
@@ -23,7 +23,7 @@ rpm-build:
     - ./tmp/ondemand-packaging/bin/ood_packaging -w $CI_PROJECT_DIR/tmp/work -o $CI_PROJECT_DIR/tmp/output -V $CI_COMMIT_TAG -T $CI_PROJECT_DIR
   parallel:
     matrix:
-      - OOD_PACKAGING_DIST: [el7, el8]
+      - OOD_PACKAGING_DIST: [el8]
   artifacts:
     paths:
       - tmp/output

Gemfile

@@ -46,3 +46,7 @@ gem 'ood_appkit', '~> 2.1'
 gem 'ood_core', '~> 0.21.0'
 
 gem 'nokogiri', '>= 1.10.4'
+
+# ruby 3.1 ships psych 4 which breaks
+# and rails 6.0 does not have the patch
+gem 'psych', '< 4'

Gemfile.lock

@@ -141,6 +141,7 @@ GEM
       ood_support (~> 0.0.2)
       rexml (~> 3.2)
     ood_support (0.0.3)
+    psych (3.3.4)
     public_suffix (5.0.1)
     racc (1.6.2)
     rack (2.2.6.4)
@@ -233,6 +234,7 @@ DEPENDENCIES
   nokogiri (>= 1.10.4)
   ood_appkit (~> 2.1)
   ood_core (~> 0.21.0)
+  psych (< 4)
   rails (= 6.0.6.1)
   sass-rails (~> 5.0)
   sqlite3 (~> 1.4.0)