Remove SCL runtime dependency (#287)

* Remove SCL runtime dependency

* Update release manifest

* Run external tests using 4.0.0

.github/workflows/e2e.yaml

@@ -308,7 +308,7 @@ jobs:
           git clone https://github.com/OSC/${{ matrix.package }}.git ./tmp/${{ matrix.package }}
       - name: Build ${{ matrix.package }} package
         if: matrix.arch == 'x86_64'
-        run: ./bin/ood_packaging -w ./tmp/work -o ./tmp/output -d ${{ matrix.dist }} -a ${{ matrix.arch }} -V v3.1.0 -T --debug $(pwd)/tmp/${{ matrix.package }}
+        run: ./bin/ood_packaging -w ./tmp/work -o ./tmp/output -d ${{ matrix.dist }} -a ${{ matrix.arch }} -V v4.0.0 -T --debug $(pwd)/tmp/${{ matrix.package }}
       - name: arch distro
         if: ${{ matrix.arch != 'x86_64' && github.event_name == 'schedule' }}
         run: |
@@ -332,6 +332,6 @@ jobs:
             git config --global --add safe.directory $GITHUB_WORKSPACE
             bundle install
             git config --global --add safe.directory $GITHUB_WORKSPACE/tmp/${{ matrix.package }}
-            ./bin/ood_packaging -w ./tmp/work -o ./tmp/output -d ${{ matrix.dist }} -a ${{ matrix.arch }} -V v3.1.0 -T --debug $(pwd)/tmp/${{ matrix.package }}
+            ./bin/ood_packaging -w ./tmp/work -o ./tmp/output -d ${{ matrix.dist }} -a ${{ matrix.arch }} -V v4.0.0 -T --debug $(pwd)/tmp/${{ matrix.package }}
           env: |
             OOD_PACKAGING_DEBUG: 'true'

.gitlab-ci.yml

@@ -25,7 +25,7 @@ build-image:
     - if: '$CI_COMMIT_BRANCH !~ /^(main|[0-9]\.[0-9])$/ && $CI_COMMIT_TAG == null'
     - if: $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /v[0-9].+/
   script:
-    - '[ -z ${CI_COMMIT_TAG+x} ] && { bundle exec rake ood_packaging:buildbox:pull || true ; }'
+    - 'bundle exec rake ood_packaging:buildbox:pull || true'
     - bundle exec rake ood_packaging:buildbox:build
   parallel:
     matrix:

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ood_packaging (0.16.1)
+    ood_packaging (0.16.2)
       rake (~> 13.0.1)
 
 GEM

lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.16.1'
+  VERSION = '0.16.2'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '4.0.0',
@@ -12,7 +12,7 @@ module OodPackaging
       '(ubuntu|debian)' => '5',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '4.0.1',
+    'ondemand-runtime'        => '4.0.2',
     'scl-utils'               => '2.0.3',
     'passenger'               => '6.0.23',
     'cjose'                   => '0.6.1',

packages/ondemand-runtime/rpm/ondemand-runtime.spec

@@ -31,14 +31,14 @@ Summary:   Package that handles %{scl} Software Collection.
 License:   MIT
 
 BuildRequires:  scl-utils-build
-Requires:       scl-utils
 Obsoletes: ondemand-python
 
 %description
 Package shipping essential scripts to work with %{scl} Software Collection.
 
 %package -n ondemand-build
 Summary: Package shipping basic build configuration
+Requires: scl-utils
 Requires: scl-utils-build
 Requires: curl
 Requires: make

packages/passenger/rpm/passenger.spec

@@ -6,7 +6,7 @@
 %define release_version %{package_release}
 %define ngix_release_version 1
 
-%define runtime_version 4.0.1
+%define runtime_version 4.0.2
 
 %global  nginx_user          %{?scl_prefix}nginx
 %global  nginx_group         %{nginx_user}

release-manifest.yaml

@@ -1,6 +1,6 @@
 major: '4.0'
 full: '4.0.0'
-runtime: '4.0.1'
+runtime: '4.0.2'
 
 # release
 ondemand-release: