Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop distributing mod_auth_openidc and cjose #289

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Stop distributing mod_auth_openidc and cjose #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .github/workflows/e2e.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ jobs:
- ondemand-release-latest
- ondemand-runtime
- passenger
- cjose
- mod_auth_openidc
- ondemand_exporter
- ondemand-compute
- python-websockify
Expand All @@ -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
Expand Down
44 changes: 0 additions & 44 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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/*
10 changes: 0 additions & 10 deletions lib/ood_packaging/tasks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
2 changes: 0 additions & 2 deletions lib/ood_packaging/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
64 changes: 0 additions & 64 deletions packages/cjose/rpm/cjose.spec
View file
Open in desktop

This file was deleted.

117 changes: 0 additions & 117 deletions packages/mod_auth_openidc/rpm/mod_auth_openidc.spec
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions release-manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down