Subject | Hash | Author | Date (UTC) |
---|---|---|---|
Prepare correctly for rgfs (missed some places) | 38d255af17a72fd9f92a8c37d4fddc8f2caf023b | Catalin(ux) M. BOIE | 2021-11-17 18:05:01 |
TODO/cosmetic | d4968bc1d9c8bbe3c4aba2479f3694a7a3863d0f | Catalin(ux) M. BOIE | 2021-11-17 18:04:36 |
More debug help | 74f45188bffd7630d0c08648433749a3ef23c9af | Catalin(ux) M. BOIE | 2021-11-15 17:34:58 |
worker: Fixed a stupid bug leading to wrong distro upgrade command | d9bc215557cd9a6f30dbc90434dc3aba46e39979 | Catalin(ux) M. BOIE | 2021-11-14 16:16:43 |
Silence an 'unpack' exception when we do not have enough bytes. | add562b15d94501a0585001db526b241c251b6e6 | Catalin(ux) M. BOIE | 2021-11-14 11:25:01 |
Run struct and fixes under the same lock | d046942317c73351473a18eb833318aec3f4d907 | Catalin(ux) M. BOIE | 2021-11-14 08:18:05 |
spec file small updates | 7aef02df6ed5f6ce4d39cd2a926a79bcdc1a3c5a | Catalin(ux) M. BOIE | 2021-11-14 06:33:35 |
Typo | b0087441b4d637c7bf6ed64b6c243ad2ec8f1493 | Catalin(ux) M. BOIE | 2021-11-14 06:15:00 |
spec: Added 'Replaces: rocketgit' to easy upgrade, fixed fixfiles | c380f40fe86ddf70b99030a6f0be93d91137b909 | Catalin(ux) M. BOIE | 2021-11-14 06:14:25 |
Fixed non debug case of rg_debug_html | 523f6784671e5f810b8435ad66ad21ea548219d8 | Catalin(ux) M. BOIE | 2021-11-14 05:58:37 |
Fix rate limit types | 0de3ee35d0d0e46521d64a596232765fb5d618a3 | Catalin(ux) M. BOIE | 2021-11-14 05:58:03 |
commented request_slowlog_timeout | 505877b567807e11f25695de58725f316f10043e | Catalin(ux) M. BOIE | 2021-11-13 17:32:46 |
systemctl git.socket rethinking | 3c71e58760f6abc69db661098840c277d4fc13fb | Catalin(ux) M. BOIE | 2021-11-13 17:25:52 |
PHP FALSE verus NULL correction | 42f8bc560a0ec2203f0974e203e6c33ec26aa983 | Catalin(ux) M. BOIE | 2021-11-13 16:31:33 |
.spec: some minor corrections | 70c3a23f507d57c729e0d710ec99060e0e88c238 | Catalin(ux) M. BOIE | 2021-11-13 16:22:11 |
Rework locking for struct update | da8c09e15e485563d9573de3aff2a7ad999d2527 | Catalin(ux) M. BOIE | 2021-11-13 16:15:45 |
gpg: specify rsa 4096 instead of default because it does not work on f34 | eccdc02a82ce87f426eebc995988f907d914a3c7 | Catalin(ux) M. BOIE | 2021-11-13 16:15:15 |
Cosmetic | 0b0a9f2d1922d4d28052c6b1fbe737cc4302ce73 | Catalin(ux) M. BOIE | 2021-11-13 16:14:37 |
PHP8 corrections | 51f2cabc7298b5006bf8f0d215c1a338bee92cdb | Catalin(ux) M. BOIE | 2021-11-13 16:13:13 |
.spec: require openldap-servers to test LDAP | 84e469d5d9fe81509ff3421bdb6517786ea96628 | Catalin(ux) M. BOIE | 2021-11-06 20:09:07 |
File | Lines added | Lines deleted |
---|---|---|
inc/user/packages.inc.php | 18 | 0 |
inc/user/packages_rpm.inc.php | 4 | 2 |
inc/user/pkg_subrepo.inc.php | 3 | 1 |
inc/wh/build.inc.php | 3 | 1 |
scripts/builder.php | 0 | 5 |
File inc/user/packages.inc.php changed (mode: 100644) (index 144a3a8..e77ac66) | |||
... | ... | function rg_packages_web($db, $rg, $paras, $pass) | |
610 | 610 | ||
611 | 611 | rg_log_exit(); | rg_log_exit(); |
612 | 612 | } | } |
613 | |||
614 | /* | ||
615 | * Prepare array with rgfs information | ||
616 | */ | ||
617 | function rg_pkg_prepare_for_rgfs($db, &$a) | ||
618 | { | ||
619 | $list = array('rgfs_server', 'rgfs_port', 'rgfs_url'); | ||
620 | foreach ($list as $k) { | ||
621 | $_r = rg_state_get($db, $k); | ||
622 | if ($_r !== FALSE) { | ||
623 | rg_log('DEBUG: a[' . $k . '] set to ' . $_r); | ||
624 | $a[$k] = $_r; | ||
625 | } else { | ||
626 | rg_log($k . ' is not defined'); | ||
627 | } | ||
628 | } | ||
629 | } | ||
630 |
File inc/user/packages_rpm.inc.php changed (mode: 100644) (index 9f4a3b1..b10344c) | |||
... | ... | function rg_pkg_event_generate_dotrepo_rpm_callback($db, $ev) | |
71 | 71 | * rg_pkg_event_generate_dotrepo_rpm. | * rg_pkg_event_generate_dotrepo_rpm. |
72 | 72 | * TODO: add a generic function which will call this function for rpm. | * TODO: add a generic function which will call this function for rpm. |
73 | 73 | */ | */ |
74 | function rg_pkg_prepare_ev_for_dotrepo($db, &$ev) | ||
74 | function rg_pkg_prepare_for_dotrepo($db, &$ev) | ||
75 | 75 | { | { |
76 | 76 | rg_log_enter('pkg_prepare_for_dotrepo'); | rg_log_enter('pkg_prepare_for_dotrepo'); |
77 | 77 | ||
... | ... | function rg_pkg_event_generate_dotrepo_rpm($db, $ev) | |
191 | 191 | 'flags' => '' | 'flags' => '' |
192 | 192 | ); | ); |
193 | 193 | ||
194 | $r = rg_pkg_prepare_ev_for_dotrepo($db, $ev); | ||
194 | rg_pkg_prepare_for_rgfs($db, $ev); | ||
195 | |||
196 | $r = rg_pkg_prepare_for_dotrepo($db, $ev); | ||
195 | 197 | if ($r['ok'] != 1) { | if ($r['ok'] != 1) { |
196 | 198 | rg_log('Cannot prepare ev: ' . $r['errmsg']); | rg_log('Cannot prepare ev: ' . $r['errmsg']); |
197 | 199 | break; | break; |
File inc/user/pkg_subrepo.inc.php changed (mode: 100644) (index ee405d8..50accda) | |||
... | ... | function rg_pkg_subrepo_event_regenerate($db, $ev) | |
119 | 119 | ||
120 | 120 | unset($ev['pkg_subrepo_id_list']); | unset($ev['pkg_subrepo_id_list']); |
121 | 121 | ||
122 | $r = rg_pkg_prepare_ev_for_dotrepo($db, $ev); | ||
122 | rg_pkg_prepare_for_rgfs($db, $ev); | ||
123 | |||
124 | $r = rg_pkg_prepare_for_dotrepo($db, $ev); | ||
123 | 125 | if ($r['ok'] != 1) { | if ($r['ok'] != 1) { |
124 | 126 | rg_log('Cannot prepare ev: ' . $r['errmsg']); | rg_log('Cannot prepare ev: ' . $r['errmsg']); |
125 | 127 | break; | break; |
File inc/wh/build.inc.php changed (mode: 100644) (index a505bfb..69dae5a) | |||
... | ... | function rg_wh_build_send_one($db, $ev) | |
127 | 127 | $a['pkg_repos'] = $r['pkg_repos']; | $a['pkg_repos'] = $r['pkg_repos']; |
128 | 128 | $a['pkg_subrepos'] = $r['pkg_subrepos']; | $a['pkg_subrepos'] = $r['pkg_subrepos']; |
129 | 129 | ||
130 | rg_pkg_prepare_for_rgfs($db, $a); | ||
131 | |||
130 | 132 | $a['exec'] = array(); | $a['exec'] = array(); |
131 | 133 | $a['exec']['prepare_rpms'] = 1; | $a['exec']['prepare_rpms'] = 1; |
132 | 134 | $a['exec']['copy_to_rgfs'] = 1; | $a['exec']['copy_to_rgfs'] = 1; |
133 | 135 | ||
134 | $r = rg_pkg_prepare_ev_for_dotrepo($db, $a); | ||
136 | $r = rg_pkg_prepare_for_dotrepo($db, $a); | ||
135 | 137 | if ($r['ok'] != 1) { | if ($r['ok'] != 1) { |
136 | 138 | rg_log('Cannot prepare ev: ' . $r['errmsg']); | rg_log('Cannot prepare ev: ' . $r['errmsg']); |
137 | 139 | break; | break; |
File scripts/builder.php changed (mode: 100644) (index 745687f..6312f0d) | |||
... | ... | function rg_process_job($db, &$job) | |
800 | 800 | // Send only what is really needed | // Send only what is really needed |
801 | 801 | $job2 = $req; | $job2 = $req; |
802 | 802 | ||
803 | // TODO: this should be configurable! | ||
804 | $job2['rgfs_server'] = 'rg.embedromix.ro'; | ||
805 | $job2['rgfs_port'] = 9003; | ||
806 | $job2['rgfs_url'] = '/rgfs'; | ||
807 | |||
808 | 803 | $job2['worker_id'] = $i['worker_id']; | $job2['worker_id'] = $i['worker_id']; |
809 | 804 | $job2['worker_name'] = $name; | $job2['worker_name'] = $name; |
810 | 805 |
Date/time (UTC) | Type | Misc | Labels |
---|---|---|---|
2021-11-17 19:11 | build | fedora-34-x86_64 | worker/r1 builder/color=fff worker_elap/364s wait_time/1s date/2021-11-17 time/19:04 |
2021-11-17 19:18 | build | fedora-35-x86_64 | worker/r1 builder/color=fff worker_elap/368s wait_time/424s date/2021-11-17 time/19:04 |
2021-11-17 19:26 | build | rocky-8-x86_64 | worker/r1 builder/color=fff worker_elap/381s wait_time/843s date/2021-11-17 time/19:04 |