Skip to content

Commit

Permalink
Eliminate Pulp from ros_buildfarm (#998)
Browse files Browse the repository at this point in the history
The createrepo-agent replacement for how we were previously using Pulp
is proving to be at least as stable as our Pulp-based solution. It's
time to remove all of the unused Pulp-related code from ros_buildfarm.
  • Loading branch information
cottsay authored Apr 3, 2024
1 parent ebf3c90 commit a233135
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 970 deletions.
10 changes: 0 additions & 10 deletions doc/configuration_options.rst
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,6 @@ Description of common options
master which is commonly used to upload artifacts to another host.
This credential id is set in the buildfarm_deployment.

* **Upload destination credential ID**: the ID of the credential entry managed
on the Jenkins master which contains the destination information used to
upload artifacts to another host.
This credential id is set in the buildfarm_deployment.
At present, this value is only used for RPM jobs.


Specific options in release build files
---------------------------------------

Expand Down Expand Up @@ -237,9 +230,6 @@ The following options are valid in version ``2`` (beside the generic options):
* ``upload_credential_id``: the ID of the credential to upload the built
packages to the repository host.

* ``upload_credential_id_pulp``: the ID of the credential to upload the built
RPM packages to the repository host instance of Pulp.

* ``upload_host``: the hostname of the repository host where built packages
shoudl be uploaded to.
Only affects RPM builds at present.
Expand Down
43 changes: 0 additions & 43 deletions ros_buildfarm/argument.py
Original file line number Diff line number Diff line change
Expand Up @@ -395,49 +395,6 @@ def add_argument_build_tool_test_args(parser):
help='Arbitrary arguments passed to the build tool during testing.')


def add_argument_pulp_base_url(parser):
from_env = os.environ.get('PULP_BASE_URL')
return parser.add_argument(
'--pulp-base-url',
default=from_env, required=not bool(from_env),
help='URL of the pulp API endpoint')


def add_argument_pulp_distribution_name(parser):
return parser.add_argument(
'--pulp-distribution-name', required=True,
help='Name of the pulp distribution to target with changes')


def add_argument_pulp_password(parser):
from_env = os.environ.get('PULP_PASSWORD')
return parser.add_argument(
'--pulp-password',
default=from_env, required=not bool(from_env),
help='Password used to access the pulp API endpoint')


def add_argument_pulp_resource_record(parser):
return parser.add_argument(
'--pulp-resource-record', default=None, metavar='FILE',
help='File in which to record the pulp HREFs of package resources')


def add_argument_pulp_task_timeout(parser):
return parser.add_argument(
'--pulp-task-timeout',
type=float, default=60.0,
help='Duration to wait (in seconds) for a pulp task to complete')


def add_argument_pulp_username(parser):
from_env = os.environ.get('PULP_USERNAME')
return parser.add_argument(
'--pulp-username',
default=from_env, required=not bool(from_env),
help='Username used to access the pulp API endpoint')


def add_argument_repos_file_urls(parser):
parser.add_argument(
'--repos-file-urls', nargs='*', metavar='URL',
Expand Down
8 changes: 0 additions & 8 deletions ros_buildfarm/config/release_build_file.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,6 @@ def __init__(self, name, data): # noqa: D107
assert 'upload_credential_id' in data
self.upload_credential_id = data['upload_credential_id']

self.upload_credential_id_pulp = None
if 'upload_credential_id_pulp' in data:
self.upload_credential_id_pulp = data['upload_credential_id_pulp']

self.upload_destination_credential_id = None
if 'upload_destination_credential_id' in data:
self.upload_destination_credential_id = data['upload_destination_credential_id']

self.upload_host = None
if 'upload_host' in data:
self.upload_host = data['upload_host']
Expand Down
Loading

0 comments on commit a233135

Please sign in to comment.