Stop distributing mod_auth_openidc and cjose (#289)

OSC · Nov 25, 2024 · e859d93 · e859d93
1 parent 632a19a
commit e859d93
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 262 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -81,8 +81,6 @@ jobs:
           - ondemand-release-latest
           - ondemand-runtime
           - passenger
-          - cjose
-          - mod_auth_openidc
           - ondemand_exporter
           - ondemand-compute
           - python-websockify
@@ -97,10 +95,6 @@ jobs:
             arch: aarch64
             package: scl-utils
         exclude:
-          - dist: el9
-            package: cjose
-          - dist: el9
-            package: mod_auth_openidc
           - arch: aarch64
             package: ondemand-release
           - arch: aarch64

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -146,48 +146,6 @@ build-passenger:
       - tmp/output
     name: "$CI_PROJECT_NAME-$CI_COMMIT_TAG"
 
-build-cjose:
-  stage: build
-  rules:
-    # Re-enable once Gitlab instance using plugin to integrate with Github
-    # - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
-    - if: '$CI_COMMIT_BRANCH !~ /^(main|[0-9]\.[0-9])$/ && $CI_COMMIT_TAG == null'
-    - if: '$CI_COMMIT_TAG =~ /^cjose-/'
-  script:
-    - bundle exec rake ood_packaging:package:cjose[$DIST]
-  parallel:
-    matrix:
-      - OOD_PACKAGING_DIST: [el8]
-        OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le]
-        OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec
-      - OOD_PACKAGING_DIST: [amzn2023]
-        OOD_PACKAGING_ARCH: [x86_64, aarch64]
-  artifacts:
-    paths:
-      - tmp/output
-    name: "$CI_PROJECT_NAME-$CI_COMMIT_TAG"
-
-build-mod_auth_openidc:
-  stage: build
-  rules:
-    # Re-enable once Gitlab instance using plugin to integrate with Github
-    # - if: '$CI_PIPELINE_SOURCE == "external_pull_request_event"'
-    - if: '$CI_COMMIT_BRANCH !~ /^(main|[0-9]\.[0-9])$/ && $CI_COMMIT_TAG == null'
-    - if: '$CI_COMMIT_TAG =~ /^mod_auth_openidc-/'
-  script:
-    - bundle exec rake ood_packaging:package:mod_auth_openidc[$DIST]
-  parallel:
-    matrix:
-      - OOD_PACKAGING_DIST: [el8]
-        OOD_PACKAGING_ARCH: [x86_64, aarch64, ppc64le]
-        OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec
-      - OOD_PACKAGING_DIST: [amzn2023]
-        OOD_PACKAGING_ARCH: [x86_64, aarch64]
-  artifacts:
-    paths:
-      - tmp/output
-    name: "$CI_PROJECT_NAME-$CI_COMMIT_TAG"
-
 build-ondemand_exporter:
   stage: build
   rules:
@@ -308,7 +266,5 @@ package-deploy-build:
     - if: '$CI_COMMIT_TAG =~ /^ondemand-runtime-/'
     - if: '$CI_COMMIT_TAG =~ /^scl-utils-/'
     - if: '$CI_COMMIT_TAG =~ /^passenger-/'
-    - if: '$CI_COMMIT_TAG =~ /^cjose-/'
-    - if: '$CI_COMMIT_TAG =~ /^mod_auth_openidc-/'
   script:
     - ./release.py --debug --pkey /systems/osc_certs/ssh/ondemand-packaging/id_rsa -c build -r $OOD_BUILD_REPO ./tmp/output/*
diff --git a/lib/ood_packaging/tasks.rb b/lib/ood_packaging/tasks.rb
@@ -86,16 +86,6 @@
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
     end
 
-    desc 'Package cjose'
-    task :cjose, [:dist, :arch] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
-    end
-
-    desc 'Package mod_auth_openidc'
-    task :mod_auth_openidc, [:dist, :arch] do |t, args|
-      Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])
-    end
-
     desc 'Package ondemand_exporter'
     task :ondemand_exporter, [:dist, :arch] do |t, args|
       Rake::Task['ood_packaging:package:internal'].invoke(t.name, args[:dist], args[:arch])

diff --git a/lib/ood_packaging/version.rb b/lib/ood_packaging/version.rb
@@ -15,8 +15,6 @@ module OodPackaging
     'ondemand-runtime'        => '4.0.3',
     'scl-utils'               => '2.0.3',
     'passenger'               => '6.0.23',
-    'cjose'                   => '0.6.1',
-    'mod_auth_openidc'        => '2.4.14.1',
     'ondemand_exporter'       => '0.10.0',
     'ondemand-compute'        => {
       '(ubuntu|debian)' => '4.0.0',

diff --git a/packages/cjose/rpm/cjose.spec b/packages/cjose/rpm/cjose.spec
diff --git a/packages/mod_auth_openidc/rpm/mod_auth_openidc.spec b/packages/mod_auth_openidc/rpm/mod_auth_openidc.spec
diff --git a/release-manifest.yaml b/release-manifest.yaml
@@ -16,25 +16,6 @@ ondemand-release:
     - '{major}.2-bookworm'
 
 # web
-cjose:
-  packages:
-    - cjose
-    - cjose-debuginfo
-    - cjose-devel
-  versions:
-    - 0.6.1-1
-httpd24-mod_auth_openidc:
-  packages:
-    - httpd24-mod_auth_openidc
-    - httpd24-mod_auth_openidc-debuginfo
-  versions:
-    - 2.4.14.1-1
-mod_auth_openidc:
-  packages:
-    - mod_auth_openidc
-    - mod_auth_openidc-debuginfo
-  versions:
-    - 2.4.14.1-1
 ondemand-nginx:
   packages:
     - ondemand-nginx