From e204c6ca55727e013a353cd4cdcac78eb6cc4307 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sun, 5 Dec 2021 17:56:00 +0100 Subject: [PATCH] Rename to dbd --- {fws => dbd}/builder/__init__.py | 0 {fws => dbd}/builder/fetch.py | 0 {fws => dbd}/builder/main.py | 0 dbd/releaser/__init__.py | 3 +++ {fws => dbd}/releaser/main.py | 2 +- fws/releaser/__init__.py | 3 --- releasers.conf | 39 ++++++++++---------------------- 7 files changed, 16 insertions(+), 31 deletions(-) rename {fws => dbd}/builder/__init__.py (100%) rename {fws => dbd}/builder/fetch.py (100%) rename {fws => dbd}/builder/main.py (100%) create mode 100644 dbd/releaser/__init__.py rename {fws => dbd}/releaser/main.py (97%) delete mode 100644 fws/releaser/__init__.py diff --git a/fws/builder/__init__.py b/dbd/builder/__init__.py similarity index 100% rename from fws/builder/__init__.py rename to dbd/builder/__init__.py diff --git a/fws/builder/fetch.py b/dbd/builder/fetch.py similarity index 100% rename from fws/builder/fetch.py rename to dbd/builder/fetch.py diff --git a/fws/builder/main.py b/dbd/builder/main.py similarity index 100% rename from fws/builder/main.py rename to dbd/builder/main.py diff --git a/dbd/releaser/__init__.py b/dbd/releaser/__init__.py new file mode 100644 index 0000000..680ee57 --- /dev/null +++ b/dbd/releaser/__init__.py @@ -0,0 +1,3 @@ +from dbd.releaser.main import \ + RsyncSRPMSReleaser + diff --git a/fws/releaser/main.py b/dbd/releaser/main.py similarity index 97% rename from fws/releaser/main.py rename to dbd/releaser/main.py index b47f276..ac125b3 100644 --- a/fws/releaser/main.py +++ b/dbd/releaser/main.py @@ -26,7 +26,7 @@ class RsyncSRPMSReleaser(RsyncReleaser): prefix="temp_dir=", **kwargs): if target == 'branch': target = run_command('git symbolic-ref --short HEAD') - if target in [ 'el5', 'el6', 'el7', 'el8','sme9', 'sme10' ]: + if target in [ 'el5', 'el6', 'el7', 'el8' ]: # Call ourselve with the new target self.__init__(name, tag, build_dir, config, user_config, target, releaser_config, no_cleanup, test, diff --git a/fws/releaser/__init__.py b/fws/releaser/__init__.py deleted file mode 100644 index bddee77..0000000 --- a/fws/releaser/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from fws.releaser.main import \ - RsyncSRPMSReleaser - diff --git a/releasers.conf b/releasers.conf index 0647c09..1b3fb9a 100644 --- a/releasers.conf +++ b/releasers.conf @@ -1,34 +1,19 @@ -[el5] -releaser = fws.releaser.RsyncSRPMSReleaser -srpm_disttag = .fws -rsync = build.firewall-services.com:/var/lib/build/uploads/el5 - [el6] -releaser = fws.releaser.RsyncSRPMSReleaser -srpm_disttag = .fws -rsync = build.firewall-services.com:/var/lib/build/uploads/el6 +releaser = dbd.releaser.RsyncSRPMSReleaser +srpm_disttag = .dbd +rsync = build.lapiole.org:/var/lib/build/uploads/el6 [el7] -releaser = fws.releaser.RsyncSRPMSReleaser -srpm_disttag = .fws -rsync = build.firewall-services.com:/var/lib/build/uploads/el7 +releaser = dbd.releaser.RsyncSRPMSReleaser +srpm_disttag = .dbd +rsync = build.lapiole.org:/var/lib/build/uploads/el7 [el8] -releaser = fws.releaser.RsyncSRPMSReleaser -srpm_disttag = .fws -rsync = build.firewall-services.com:/var/lib/build/uploads/el8 - -[sme9] -releaser = fws.releaser.RsyncSRPMSReleaser -srpm_disttag = .fws.sme -rsync = build.firewall-services.com:/var/lib/build/uploads/el6 - -[sme10] -releaser = fws.releaser.RsyncSRPMSReleaser -srpm_disttag = .fws.sme -rsync = build.firewall-services.com:/var/lib/build/uploads/el7 +releaser = dbd.releaser.RsyncSRPMSReleaser +srpm_disttag = .dbd +rsync = build.lapiole.org:/var/lib/build/uploads/el8 [branch] -releaser = fws.releaser.RsyncSRPMSReleaser -srpm_disttag = .fws -rsync = build.firewall-services.com:/var/lib/build/uploads/branch +releaser = dbd.releaser.RsyncSRPMSReleaser +srpm_disttag = .dbd +rsync = build.lapiole.org:/var/lib/build/uploads/branch