From 9fbf8c1b7c4b44e2e1eb6f9d334e00c6ea34d773 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Tue, 12 Oct 2021 15:47:32 +0200 Subject: [PATCH] copr: remove old useless or unused patches/files --- roles/copr/backend/files/DigiCertCA.crt | 28 ------------ .../backend/files/instant-instance-killer.sh | 11 ----- .../patches/fc-client-for-worker-bd.patch | 24 ---------- .../files/patches/fc-client-for-worker.patch | 45 ------------------- .../proper-action-processor-umask.patch | 11 ----- .../files/patches/prunerepo-dataloss.patch | 20 --------- roles/copr/frontend/files/DigiCertCA.crt | 28 ------------ .../patches/build_chroot_status_api.patch | 9 ---- roles/copr/frontend/tasks/main.yml | 5 --- 9 files changed, 181 deletions(-) delete mode 100644 roles/copr/backend/files/DigiCertCA.crt delete mode 100644 roles/copr/backend/files/instant-instance-killer.sh delete mode 100644 roles/copr/backend/files/patches/fc-client-for-worker-bd.patch delete mode 100644 roles/copr/backend/files/patches/fc-client-for-worker.patch delete mode 100644 roles/copr/backend/files/patches/proper-action-processor-umask.patch delete mode 100644 roles/copr/backend/files/patches/prunerepo-dataloss.patch delete mode 100644 roles/copr/frontend/files/DigiCertCA.crt delete mode 100644 roles/copr/frontend/files/patches/build_chroot_status_api.patch diff --git a/roles/copr/backend/files/DigiCertCA.crt b/roles/copr/backend/files/DigiCertCA.crt deleted file mode 100644 index d08b961f22..0000000000 --- a/roles/copr/backend/files/DigiCertCA.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEsTCCA5mgAwIBAgIQBOHnpNxc8vNtwCtCuF0VnzANBgkqhkiG9w0BAQsFADBs -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j -ZSBFViBSb290IENBMB4XDTEzMTAyMjEyMDAwMFoXDTI4MTAyMjEyMDAwMFowcDEL -MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 -LmRpZ2ljZXJ0LmNvbTEvMC0GA1UEAxMmRGlnaUNlcnQgU0hBMiBIaWdoIEFzc3Vy -YW5jZSBTZXJ2ZXIgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2 -4C/CJAbIbQRf1+8KZAayfSImZRauQkCbztyfn3YHPsMwVYcZuU+UDlqUH1VWtMIC -Kq/QmO4LQNfE0DtyyBSe75CxEamu0si4QzrZCwvV1ZX1QK/IHe1NnF9Xt4ZQaJn1 -itrSxwUfqJfJ3KSxgoQtxq2lnMcZgqaFD15EWCo3j/018QsIJzJa9buLnqS9UdAn -4t07QjOjBSjEuyjMmqwrIw14xnvmXnG3Sj4I+4G3FhahnSMSTeXXkgisdaScus0X -sh5ENWV/UyU50RwKmmMbGZJ0aAo3wsJSSMs5WqK24V3B3aAguCGikyZvFEohQcft -bZvySC/zA/WiaJJTL17jAgMBAAGjggFJMIIBRTASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw -NAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2Vy -dC5jb20wSwYDVR0fBEQwQjBAoD6gPIY6aHR0cDovL2NybDQuZGlnaWNlcnQuY29t -L0RpZ2lDZXJ0SGlnaEFzc3VyYW5jZUVWUm9vdENBLmNybDA9BgNVHSAENjA0MDIG -BFUdIAAwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQ -UzAdBgNVHQ4EFgQUUWj/kK8CB3U8zNllZGKiErhZcjswHwYDVR0jBBgwFoAUsT7D -aQP4v0cB1JgmGggC72NkK8MwDQYJKoZIhvcNAQELBQADggEBABiKlYkD5m3fXPwd -aOpKj4PWUS+Na0QWnqxj9dJubISZi6qBcYRb7TROsLd5kinMLYBq8I4g4Xmk/gNH -E+r1hspZcX30BJZr01lYPf7TMSVcGDiEo+afgv2MW5gxTs14nhr9hctJqvIni5ly -/D6q1UEL2tU2ob8cbkdJf17ZSHwD2f2LSaCYJkJA69aSEaRkCldUxPUd1gJea6zu -xICaEnL6VpPX/78whQYwvwt/Tv9XBZ0k7YXDK/umdaisLRbvfXknsuvCnQsH6qqF -0wGjIChBWUMo0oHjqvbsezt3tkBigAVBRQHvFwY+3sAzm2fTYS5yh+Rp/BIAV0Ae -cPUeybQ= ------END CERTIFICATE----- diff --git a/roles/copr/backend/files/instant-instance-killer.sh b/roles/copr/backend/files/instant-instance-killer.sh deleted file mode 100644 index da4fbade42..0000000000 --- a/roles/copr/backend/files/instant-instance-killer.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -source /home/copr/cloud/ec2rc.sh - -/bin/euca-describe-instances | grep INSTANCE | while read line; do - id="$(echo $line | cut -d' ' -f2)" - state="$(echo $line | cut -d' ' -f6)" - if [[ "$state" == "error" ]]; then - /bin/euca-terminate-instances "$id" - fi -done diff --git a/roles/copr/backend/files/patches/fc-client-for-worker-bd.patch b/roles/copr/backend/files/patches/fc-client-for-worker-bd.patch deleted file mode 100644 index 5f36e9f36c..0000000000 --- a/roles/copr/backend/files/patches/fc-client-for-worker-bd.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 6277990348da43d446468fbe9f3d47ef787e588e (HEAD -> separate-fc-for-worker, praiskup/separate-fc-for-worker) -Author: Pavel Raiskup -AuthorDate: Thu Jan 2 17:09:18 2020 +0100 -Commit: Pavel Raiskup -CommitDate: Thu Jan 2 17:12:28 2020 +0100 - - backend: separate frontend_client for each Worker process - - Because we shared FrontendClient object with BuildDispatcher, we for - some reason weren't able to communicate with RedisLogHandler and some - log entries were lost. - -diff --git a/backend/backend/daemons/build_dispatcher.py b/backend/backend/daemons/build_dispatcher.py -index 4546ca74..af7e0654 100644 ---- a/backend/backend/daemons/build_dispatcher.py -+++ b/backend/backend/daemons/build_dispatcher.py -@@ -126,7 +126,6 @@ class BuildDispatcher(multiprocessing.Process): - def start_worker(self, vm, job, reattach=False): - worker = Worker( - opts=self.opts, -- frontend_client=self.frontend_client, - vm_manager=self.vm_manager, - worker_id=self.next_worker_id, - vm=vm, job=job, reattach=reattach diff --git a/roles/copr/backend/files/patches/fc-client-for-worker.patch b/roles/copr/backend/files/patches/fc-client-for-worker.patch deleted file mode 100644 index e9d1ebdb33..0000000000 --- a/roles/copr/backend/files/patches/fc-client-for-worker.patch +++ /dev/null @@ -1,45 +0,0 @@ -commit 6277990348da43d446468fbe9f3d47ef787e588e (HEAD -> separate-fc-for-worker, praiskup/separate-fc-for-worker) -Author: Pavel Raiskup -AuthorDate: Thu Jan 2 17:09:18 2020 +0100 -Commit: Pavel Raiskup -CommitDate: Thu Jan 2 17:12:28 2020 +0100 - - backend: separate frontend_client for each Worker process - - Because we shared FrontendClient object with BuildDispatcher, we for - some reason weren't able to communicate with RedisLogHandler and some - log entries were lost. - -diff --git a/backend/backend/daemons/worker.py b/backend/backend/daemons/worker.py -index f679a1a8..001283e8 100644 ---- a/backend/backend/daemons/worker.py -+++ b/backend/backend/daemons/worker.py -@@ -12,6 +12,7 @@ from ..mockremote import MockRemote - from ..constants import BuildStatus, build_log_format - from ..helpers import register_build_result, get_redis_logger, \ - local_file_logger, run_cmd, pkg_name_evr -+from ..frontend import FrontendClient - - from ..msgbus import ( - MsgBusStomp, -@@ -26,11 +27,10 @@ from ..sshcmd import SSHConnectionError - class Worker(multiprocessing.Process): - msg_buses = [] - -- def __init__(self, opts, frontend_client, vm_manager, worker_id, vm, job, reattach=False): -+ def __init__(self, opts, vm_manager, worker_id, vm, job, reattach=False): - multiprocessing.Process.__init__(self, name="worker-{}".format(worker_id)) - - self.opts = opts -- self.frontend_client = frontend_client - self.vm_manager = vm_manager - self.worker_id = worker_id - self.vm = vm -@@ -38,6 +38,7 @@ class Worker(multiprocessing.Process): - self.reattach = reattach - - self.log = get_redis_logger(self.opts, self.name, "worker") -+ self.frontend_client = FrontendClient(self.opts, self.log) - - @property - def name(self): diff --git a/roles/copr/backend/files/patches/proper-action-processor-umask.patch b/roles/copr/backend/files/patches/proper-action-processor-umask.patch deleted file mode 100644 index 31870f0b4d..0000000000 --- a/roles/copr/backend/files/patches/proper-action-processor-umask.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /usr/bin/copr-backend-process-action 2019-12-04 01:01:26.000000000 +0000 -+++ /usr/bin/copr-backend-process-action 2019-12-05 05:43:14.586341122 +0000 -@@ -104,7 +104,7 @@ - - context = contextlib.nullcontext() - if args.daemon: -- context = daemon.DaemonContext() -+ context = daemon.DaemonContext(umask=0o22) - - with context: - logger_name = '{}.{}.pid-{}'.format( diff --git a/roles/copr/backend/files/patches/prunerepo-dataloss.patch b/roles/copr/backend/files/patches/prunerepo-dataloss.patch deleted file mode 100644 index 32bcdff342..0000000000 --- a/roles/copr/backend/files/patches/prunerepo-dataloss.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- /usr/bin/prunerepo 2019-04-01 18:02:57.000000000 +0000 -+++ /usr/bin/prunerepo 2019-11-12 09:20:27.292341122 +0000 -@@ -40,6 +40,7 @@ - '--refresh', - '--queryformat="%{location}"', - '--quiet', -+ '--setopt=skip_if_unavailable=False', - ] - - get_latest_packages_cmd = get_all_packages_cmd + [ '--latest-limit=1' ] -@@ -117,6 +118,9 @@ - log_info('Removing obsoleted packages...') - was_deletion = False - latest_rpms = get_rpms(get_latest_packages_cmd) -+ if not latest_rpms: -+ log_info("No RPMs available") -+ return was_deletion - all_rpms = get_rpms(get_all_packages_cmd) - to_remove_rpms = set(all_rpms) - set(latest_rpms) - for rpm in to_remove_rpms: diff --git a/roles/copr/frontend/files/DigiCertCA.crt b/roles/copr/frontend/files/DigiCertCA.crt deleted file mode 100644 index d08b961f22..0000000000 --- a/roles/copr/frontend/files/DigiCertCA.crt +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIEsTCCA5mgAwIBAgIQBOHnpNxc8vNtwCtCuF0VnzANBgkqhkiG9w0BAQsFADBs -MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3 -d3cuZGlnaWNlcnQuY29tMSswKQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5j -ZSBFViBSb290IENBMB4XDTEzMTAyMjEyMDAwMFoXDTI4MTAyMjEyMDAwMFowcDEL -MAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZMBcGA1UECxMQd3d3 -LmRpZ2ljZXJ0LmNvbTEvMC0GA1UEAxMmRGlnaUNlcnQgU0hBMiBIaWdoIEFzc3Vy -YW5jZSBTZXJ2ZXIgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2 -4C/CJAbIbQRf1+8KZAayfSImZRauQkCbztyfn3YHPsMwVYcZuU+UDlqUH1VWtMIC -Kq/QmO4LQNfE0DtyyBSe75CxEamu0si4QzrZCwvV1ZX1QK/IHe1NnF9Xt4ZQaJn1 -itrSxwUfqJfJ3KSxgoQtxq2lnMcZgqaFD15EWCo3j/018QsIJzJa9buLnqS9UdAn -4t07QjOjBSjEuyjMmqwrIw14xnvmXnG3Sj4I+4G3FhahnSMSTeXXkgisdaScus0X -sh5ENWV/UyU50RwKmmMbGZJ0aAo3wsJSSMs5WqK24V3B3aAguCGikyZvFEohQcft -bZvySC/zA/WiaJJTL17jAgMBAAGjggFJMIIBRTASBgNVHRMBAf8ECDAGAQH/AgEA -MA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw -NAYIKwYBBQUHAQEEKDAmMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2Vy -dC5jb20wSwYDVR0fBEQwQjBAoD6gPIY6aHR0cDovL2NybDQuZGlnaWNlcnQuY29t -L0RpZ2lDZXJ0SGlnaEFzc3VyYW5jZUVWUm9vdENBLmNybDA9BgNVHSAENjA0MDIG -BFUdIAAwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQuY29tL0NQ -UzAdBgNVHQ4EFgQUUWj/kK8CB3U8zNllZGKiErhZcjswHwYDVR0jBBgwFoAUsT7D -aQP4v0cB1JgmGggC72NkK8MwDQYJKoZIhvcNAQELBQADggEBABiKlYkD5m3fXPwd -aOpKj4PWUS+Na0QWnqxj9dJubISZi6qBcYRb7TROsLd5kinMLYBq8I4g4Xmk/gNH -E+r1hspZcX30BJZr01lYPf7TMSVcGDiEo+afgv2MW5gxTs14nhr9hctJqvIni5ly -/D6q1UEL2tU2ob8cbkdJf17ZSHwD2f2LSaCYJkJA69aSEaRkCldUxPUd1gJea6zu -xICaEnL6VpPX/78whQYwvwt/Tv9XBZ0k7YXDK/umdaisLRbvfXknsuvCnQsH6qqF -0wGjIChBWUMo0oHjqvbsezt3tkBigAVBRQHvFwY+3sAzm2fTYS5yh+Rp/BIAV0Ae -cPUeybQ= ------END CERTIFICATE----- diff --git a/roles/copr/frontend/files/patches/build_chroot_status_api.patch b/roles/copr/frontend/files/patches/build_chroot_status_api.patch deleted file mode 100644 index 4f7b932b97..0000000000 --- a/roles/copr/frontend/files/patches/build_chroot_status_api.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- /usr/share/copr/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py 2020-02-24 13:58:42.000000000 +0100 -+++ /usr/share/copr/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py 2020-03-17 14:25:55.660388927 +0100 -@@ -13,6 +13,7 @@ - "started_on": build_chroot.started_on, - "ended_on": build_chroot.ended_on, - "result_url": build_chroot.result_dir_url, -+ "state": build_chroot.state, - } - diff --git a/roles/copr/frontend/tasks/main.yml b/roles/copr/frontend/tasks/main.yml index 180dbe3c52..0a566263c7 100644 --- a/roles/copr/frontend/tasks/main.yml +++ b/roles/copr/frontend/tasks/main.yml @@ -47,11 +47,6 @@ # dest=/the/patched/file.py # tags: patches -- name: patch to provide build_chroot status over API - patch: src=patches/build_chroot_status_api.patch - dest=/usr/share/copr/coprs_frontend/coprs/views/apiv3_ns/apiv3_build_chroots.py - tags: patches - - name: directory for postgresql dumps file: state=directory path=/var/www/html/db_dumps/ owner=copr-fe mode=755