Skip to content

Commit a20a5f4

Browse files
committed
fedora-messaging: remove ostree-import request type
We no longer do OSTree imports, hence we can remove the ostree-import request type from fedora_messaging_request.py and also delete the fedmsg-send-ostree-import-request script associated with it.
1 parent b972c24 commit a20a5f4

3 files changed

Lines changed: 2 additions & 125 deletions

File tree

src/cmd-sign

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
'''
77

88
import argparse
9-
import gi
109
import json
1110
import os
1211
import shutil
@@ -22,13 +21,9 @@ from cosalib.meta import GenericBuildMeta as Meta
2221
from cosalib.builds import Builds
2322
from cosalib.cmdlib import (
2423
get_basearch,
25-
sha256sum_file,
26-
import_ostree_commit)
24+
sha256sum_file)
2725
from cosalib.fedora_messaging_request import send_request_and_wait_for_response
2826

29-
gi.require_version('OSTree', '1.0')
30-
from gi.repository import GLib, Gio, OSTree
31-
3227
# this is really the worst case scenario, it's usually pretty fast otherwise
3328
ROBOSIGNATORY_REQUEST_TIMEOUT_SEC = 60 * 60
3429

src/cosalib/fedora_messaging_request.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,14 @@
4545
# function does not return until the service replies (or we time out).
4646
# Supported request types:
4747
# - artifacts-sign: sent by build pipeline to sign images
48-
# - ostree-import: sent by release pipeline to import OSTree commits into the
49-
# canonical Fedora repos
5048
def send_request_and_wait_for_response(request_type,
5149
config=None,
5250
environment='prod',
5351
request_timeout=DEFAULT_REQUEST_TIMEOUT_SEC,
5452
priority=None,
5553
body={}):
5654
assert environment in ['prod', 'stg']
57-
assert request_type in ['artifacts-sign', 'ostree-import']
55+
assert request_type in ['artifacts-sign']
5856

5957
# Generate a unique id for this request
6058
request_id = str(uuid.uuid4())

src/fedmsg-send-ostree-import-request

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)