From 7e8f1c950c626ff8b3fe44db614929a3f2e20159 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Jun 04 2019 10:42:36 +0000 Subject: [builder] drop unused sources --- diff --git a/builder/LICENSE b/builder/LICENSE deleted file mode 100644 index d159169..0000000 --- a/builder/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/builder/README b/builder/README deleted file mode 100644 index 2813196..0000000 --- a/builder/README +++ /dev/null @@ -1,13 +0,0 @@ -Build package from copr dist-git. - -$ sudo dnf copr enable praiskup/copr-builder -$ sudo dnf install copr-builder -$ copr-builder --copr praiskup/ping \ - --package quick-package \ - --revision 5ce6ec838e22d - -We heavily depend on `rpkg` for working with `dist-git`, on `copr-cli` package -to obtain mock profile and on mock to do all the work. Please make sure to have -properly configured mock. - -(motivation https://bugzilla.redhat.com/show_bug.cgi?id=1410403) diff --git a/builder/README.md b/builder/README.md new file mode 100644 index 0000000..4a6a14f --- /dev/null +++ b/builder/README.md @@ -0,0 +1,2 @@ +The `copr-builder` package is nowadays built from +[copr-rpmbuild.spec](../rpmbuild/copr-rpmbuild.spec). diff --git a/builder/TODO b/builder/TODO deleted file mode 100644 index 9d82d42..0000000 --- a/builder/TODO +++ /dev/null @@ -1,19 +0,0 @@ -must fix -======== -- don't use rpkg, but use mock-scm's new feature for dist-git(s) - https://github.com/rpm-software-management/mock/pull/41 - -best effort -=========== -- `copr mock-config` generates configuration which doesn't include the parent - configuration via "relative" pathname. So even though we copy the system - configuration into /results/configs, it still includes the /etc/mock/.cfg - -features -======== -- when one `copr-builder` script is already running, instead of failing - immediately on lock - it would be nice if we rather re-attached ourselves - to the live-log provided by the running script - -- copy the $opt_config file into /results/configs/copr-builder.conf, for - reproducibility diff --git a/builder/copr-builder b/builder/copr-builder deleted file mode 100755 index f5f6618..0000000 --- a/builder/copr-builder +++ /dev/null @@ -1,370 +0,0 @@ -#! /bin/bash - -# Generate SRPM against Copr's dist-git instance. -# Copyright (C) 2017 Red Hat, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -################################# -##### BACKEND / BUILDER API ##### -################################# - -# PID file of the main process is stored here. Backend can read this file to -# detect the last PID of copr-builder run. -opt_pidfile=/var/lib/copr-builder/pid - -# Build results are stored here. -opt_resultdir=/var/lib/copr-builder/results - -# This is to be read by 'tail -n --retry +0 -f --pid=...' on backend side. -opt_log_file=/var/lib/copr-builder/live-log - -################################# -################################# - -opt_copr= -opt_package= -opt_revision= -opt_chroot=fedora-rawhide-x86_64 -opt_config=/etc/copr-builder/fedora-copr.conf -opt_lockfile=/var/lib/copr-builder/lock - - -opt_workdir= -opt_timeout= -opt_workdir_cleanup=false -opt_download_mock_config=: -opt_debug=false -opt_host_resolv= -opt_detached=false - - -error() { echo >&2 " # $*"; } -warn () { echo >&2 " ! $*"; } -die() { error "$*"; exit 1; } -info() { echo 2>&1 " * $*"; } -debug() { if $opt_debug; then echo 2>&1 " ~ $*"; fi ; } - -destruct () -{ - debug "running script cleanup" - if $opt_workdir_cleanup && test -n "$opt_workdir" && test -d "$opt_workdir" - then - debug "cleaning workdir" - rm -rf "$opt_workdir" - fi - - if test -n "$opt_lockfile" && test -f "$opt_lockfile" - then - rm -rf "$opt_lockfile" - fi -} - -quote_args () -{ - quote_args_result= - local sp= - for arg - do - quote_args_result+=$sp$(printf %q "$arg") - sp=' ' - done -} - -filter_backpaces () -{ - # Drop terminal sequences and strings terminated by CR (not CR LF) - sed -e 's|\x1B\[[0-9;]*[a-zA-Z]||g' \ - -e 's/.*\x0D\([^\x0a]\)/\1/g' --unbuffered -} - -stdout_wrap () -( - set -o pipefail - - # Normally, to have both stdout and stderr cleaned from backspaces, we would - # do '"$@" 2> >(filter_backpaces >&2) | filter_backpaces -b'; IOW attaching - # fifo to stderr and piping stdout through col -b. But because we want to - # wrap some 'mock' calls too, and mock has the ugly hack with - # 'stderr.isatty()' (otherwise the output is very quiet, rhbz#1166609), we - # need to run through 'unbuffer' to fake the terminal. - unbuffer "$@" 2> >(filter_backpaces >&2) | filter_backpaces -) - -show_help() -{ -cat <&2 -Usage: $0 OPTION - -Build package against copr from copr dist-git. - -Options: - --copr copr; / or @/) - --package component (package name) in particular copr - --revision git commit reference in dist-git; git hash, tag, - branch.. - --chroot chroot, e.g. fedora-rawhide-x86_64 - --config configuration file - --resultdir directory to place build results - --workdir by default, temporary working directory under - /var/lib/copr-builder is used - --define="ARG VALUE" define rpm macro - --host-resolv=[0|1] use host's resolv conf - - --detached fork the builder and run in background, this - always succeeds and prints PID of the child to - standard output - --log-file=LOG store stdout/stderr into LOG - --timeout=SECONDS fail miserably after SECONDS timeout - --mock-opts=OPTS additional mock options, shell-quote OPTS properly -EOHELP - -test -n "$1" && exit "$1" -} - -long_options=copr:,package:,revision:,config:,resultdir:,workdir:,define: -long_options+=,host-resolv:,detached,log-file:,timeout:,chroot:,mock-opts: -oldargs=( "$@" ) -ARGS=$(getopt -o "h" -l "$long_options,help" -n "getopt" -- "$@") -mock=(mock) -rpkg=copr-rpkg -eval set -- "$ARGS" - -while :; do - case "$1" in - --copr|--package|--revision|--config|--resultdir|--workdir| \ - --host-resolv|--log-file|--timeout|--chroot) - opt=${1##--} - opt=${opt##-} - opt=${opt//-/_} - eval "opt_$opt=\$2" - shift 2 - ;; - - --detached) - opt=${1##--} - opt=${opt##-} - opt=${opt//-/_} - eval "opt_$opt=:" - shift 1 - ;; - - --mock-opts) - # Eval is needed to keep the right number of arguments, e.g. - # --mock-opts='--rpmbuild-opts "-vv --fsmdebug -ddd --rpmiodebug"' - eval "mock+=( $2 )" - shift 2 - ;; - - --define) - mock+=(--define "$2") - shift 2 - ;; - - --help) - show_help 0 - ;; - - --) # end! - shift - break - ;; - - *) - echo "programmer mistake ($1)" >&2 - exit 1 - ;; - esac -done - -if $opt_detached; then - # Parent process. Re-exec ourselves in background, but now _without_ - # the --detached option. - new_args=() - for arg in "${oldargs[@]}" - do - case $arg in - --detached) ;; - *) new_args+=( "$arg" ) ;; - esac - done - # Copr backend runs: - # 'ssh -t "copr-builder --detached"' - # This triggers those processes on builder-side: - # (0) + bash -c 'copr-builder --detached' - # (1) + copr-builder --detached - # (2) + copr-builder ... (detached) - # The pseudo terminal allocated for this session is closed right after the - # 'exit 0' command below, which means SIGHUP is sent to (2) command. - # Ignoring the SIGHUP in (2) would be racy (signal can be delivered before - # the signal handler is actually installed) so we rather ignore it here - # already in process (1). - trap "" SIGHUP - "$0" "${new_args[@]}" &>/dev/null & - echo $! - exit 0 -fi - -# Reexec ourselves if we want to timeout. -test -n "$opt_timeout" && test -z "$TIMEOUT_SET" \ - && TIMEOUT_SET=: exec timeout "$opt_timeout" "$0" "${oldargs[@]}" - -# Start doing the work, but ensure only one copr-builder at the same time! -set -e -exec 9>"$opt_lockfile" -flock -n 9 || die "can't lock $opt_lockfile" - -# Ensure there are no leftovers. -trap destruct EXIT - -# Make the "re-attaching" in copr-backend Worker convenient. That's to be done -# by 'tail --retry -f --pid=`cat pidfile`'. -echo $$ > "$opt_pidfile" - -# Duplicate all output to the log file. -exec &> >(tee -i "$opt_log_file") - -quote_args copr-builder "${oldargs[@]}" -info "running command: $quote_args_result" - -opt_parse_error () -{ - error "$*" - opt_parse_success=false -} - -opt_parse_success=: -for opt in copr package revision config chroot; do - eval "test -z \"\$opt_$opt\"" \ - && opt_parse_error "missing argument --$opt" -done - -test -r "$opt_config" \ - || opt_parse_error "Missing or unreadable config file '$opt_config'" -opt_config=$(readlink -f "$opt_config") - -case $opt_resultdir in -:tmp:) - opt_resultdir=$(mktemp -d) - info "Results to be placed into '$opt_resultdir'" - ;; -/var/lib/copr-builder/results) - # We know that it is safe to remove everything from here. - rm -rf "$opt_resultdir" - mkdir "$opt_resultdir" - ;; -esac - -test -d "$opt_resultdir" || opt_parse_error "'$opt_resultdir' is not dir" - -if test -n "$opt_workdir"; then - if test -d "$opt_workdir"; then - test -w "$opt_workdir" || opt_parse_error "'$opt_workdir' is not a dir" - else - opt_parse_error "Directory '$opt_workdir' is not writeable." - fi -else - opt_workdir_cleanup=: - opt_workdir=$(mktemp -d /var/lib/copr-builder/build-XXXXX) \ - || opt_parse_error "can't create workdir" -fi - -case $opt_host_resolv in - 1|yes|True|true) opt_host_resolv=True ;; - 0|no|False|false) opt_host_resolv=False ;; - '') ;; # default: unchanged - *) opt_parse_error "Use --host-resolv=1 (or 0)" ;; -esac - -$opt_parse_success - -eval "$(crudini --format=sh --get "$opt_config" copr_builder)" - -success=: -for opt in branching -do - eval "test -z \"\$$opt\"" \ - && error "missing config option $opt" \ - && success=false -done -$success - -# Construct 'rpkg' options, use them as '$@' later. -set -- --verbose --debug --config "$opt_config" - -# TODO: drop this hack after https://pagure.io/rpkg/pull-request/212 -set -- "$@" --release rhel-7.2 - -cd "$opt_workdir" - -info "Copying system mock configuration" -configs_dir=$opt_resultdir/configs -mkdir -p "$configs_dir" -cp /etc/mock/site-defaults.cfg "$configs_dir" -cp "/etc/mock/$opt_chroot.cfg" "$configs_dir" - -info "Downloading changed mock config from frontend" -if $opt_download_mock_config; then - copr --config "$opt_config" mock-config "$opt_copr" "$opt_chroot" \ - > "$configs_dir"/changed.cfg -fi -mock+=(--configdir "$configs_dir" -r changed) - -if test -n "$opt_host_resolv"; then - echo "config_opts['use_host_resolv'] = $opt_host_resolv" \ - >> "$configs_dir"/changed.cfg -fi - -info "Obtain sources from dist-git" -stdout_wrap "$rpkg" "$@" clone -a "$opt_copr/$opt_package" pkg-git -( -cd pkg-git -git checkout "$opt_revision" -stdout_wrap "$rpkg" "$@" --module-name "$opt_copr/$opt_package" sources -) - -# Let's take properly named specfile preference before we fallback to -# alphabetical order. -specfile=pkg-git/"$opt_package".spec -test -f "$specfile" || { - warn "guidelines: $opt_package.spec file is expected, but missing" - set -- pkg-git/*.spec - test $# = 1 || warn "multiple spec files $* in your package!" - test -f "$1" && specfile=$1 -} - -info "Generate SRPM in mock $opt_chroot" -stdout_wrap "${mock[@]}" \ - --buildsrpm \ - --spec "$specfile" \ - --sources pkg-git \ - --resultdir intermediate-srpm \ - --no-cleanup-after - -info "Copying SRPM build logs into result directory" -srpm_logs="$opt_resultdir"/srpm-build-logs -mkdir -p "$srpm_logs" -cp intermediate-srpm/*.log* "$srpm_logs" - -set -- intermediate-srpm/*.src.rpm -test $# -ne 1 && die "multiple srpms: $* ; only one is allowed" - -info "Generate RPM in cached mock chroot" -stdout_wrap "${mock[@]}" \ - --rebuild "$1" \ - --resultdir "$opt_resultdir" \ - --no-clean - -echo done > "$opt_resultdir"/success diff --git a/builder/copr-builder.spec b/builder/copr-builder.spec deleted file mode 100644 index e126669..0000000 --- a/builder/copr-builder.spec +++ /dev/null @@ -1,141 +0,0 @@ -%global confdir %_sysconfdir/%name - -Name: copr-builder -Version: 1 -Release: 3%{?dist} -Summary: Build package from Copr dist-git - -License: GPLv2+ -URL: https://pagure.io/copr/copr - -Source0: copr-builder -Source1: LICENSE -Source3: README - -# Those could be dropped, but still we keep them at least for reference (those -# files are not aimed to be used by production builders). The real -# configuration will be copied on builder via backend's VM spin-up playbook. -Source2: fedora-copr.conf -Source4: fedora-copr-dev.conf -Source5: rhcopr.conf -Source6: rhcopr-stg.conf -Source7: rhcopr-dev.conf -Source8: rpkg - -# Ensure that 'mock' group is available for our installed files -Requires(pre): mock - -Requires: crudini -Requires: copr-cli -Requires: mock -Requires: expect -Requires: util-linux -Requires: sed - -BuildArch: noarch - -%description -Knowing copr name, package name and dist-git git hash, build automatically the -package locally in mock. - - -%prep -%setup -q -c -T -install -p -m 644 %SOURCE1 . -install -p -m 644 %SOURCE3 . - - -%build - - -%install -install -d %buildroot%_bindir -install -d %buildroot%_sysconfdir/copr-builder -install -d %buildroot%_sharedstatedir/copr-builder - -install -d %buildroot%_sharedstatedir/copr-builder/results -touch %buildroot%_sharedstatedir/copr-builder/pid -touch %buildroot%_sharedstatedir/copr-builder/lock -touch %buildroot%_sharedstatedir/copr-builder/live-log - -install -p -m 755 %SOURCE0 %buildroot%_bindir - -# Ideally we would 'Require: rpkg' only, but 'rpkg' package has been -# (temprorarily?) dropped from Fedora (rhbz#1452202). -install -p -m 755 %SOURCE8 %buildroot%_bindir/copr-rpkg -install -p -m 644 %SOURCE2 %buildroot%confdir -install -p -m 644 %SOURCE4 %buildroot%confdir -install -p -m 644 %SOURCE5 %buildroot%confdir -install -p -m 644 %SOURCE6 %buildroot%confdir -install -p -m 644 %SOURCE7 %buildroot%confdir - - -%files -%license LICENSE -%doc README -%_bindir/copr-builder -%_bindir/copr-rpkg -%confdir -%dir %attr(0775, root, mock) %_sharedstatedir/copr-builder -%ghost %dir %verify(not mode mtime) %_sharedstatedir/copr-builder/results -%ghost %verify(not md5 size mode mtime) %_sharedstatedir/copr-builder/pid -%ghost %verify(not md5 size mode mtime) %_sharedstatedir/copr-builder/lock -%ghost %verify(not md5 size mode mtime) %_sharedstatedir/copr-builder/live-log - - -%changelog -* Wed Aug 23 2017 Pavel Raiskup - 1-3 -- different spec file name from module name accepted - -* Fri Jul 21 2017 Pavel Raiskup - 1-2 -- copy srpmbuild logs into resultdir -- different srpm name from spec name is allowed - -* Sat May 27 2017 Pavel Raiskup - 1-1 -- package 'rpkg' script - -* Thu Apr 27 2017 Pavel Raiskup - 0-13 -- package review changes -- use copr vs. Copr consistently; capitalize when we talk about Copr "service", - and don't for particular coprs (projects) maintained _in_ Copr service -- use %%license properly -- Requires(pre) mock -- own some %%ghost files -- ensure doc files have 644 mode - -* Tue Apr 18 2017 Pavel Raiskup - 0-12 -- dump command-line arguments to log (easier reproducibility) - -* Thu Apr 13 2017 Pavel Raiskup - 0-10 -- add --mock-opts option - -* Tue Apr 04 2017 Pavel Raiskup - 0-9 -- more lively logs with sed filtering - -* Tue Apr 04 2017 Pavel Raiskup - 0-8 -- touch 'success' file - -* Tue Apr 04 2017 Pavel Raiskup - 0-7 -- distribute non-default configuration -- fix --chroot option - -* Tue Apr 04 2017 Pavel Raiskup - 0-6 -- add timeout option - -* Tue Apr 04 2017 Pavel Raiskup - 0-5 -- changes needed after copr PR 44 - -* Mon Mar 27 2017 Pavel Raiskup - 0-4 -- several TODOs implemented - -* Mon Mar 20 2017 Pavel Raiskup - 0-3 -- filter both stderr and stdout through 'col -b' for sub-commands - -* Mon Mar 20 2017 Pavel Raiskup - 0-2 -- a bit nicer live logs in copr - -* Sun Mar 19 2017 Pavel Raiskup - 0-1 -- package also README - -* Sun Mar 19 2017 Pavel Raiskup - 0-0 -- Initial commit diff --git a/builder/fedora-copr-dev.conf b/builder/fedora-copr-dev.conf deleted file mode 100644 index d3550e3..0000000 --- a/builder/fedora-copr-dev.conf +++ /dev/null @@ -1,17 +0,0 @@ -[rpkg] -lookaside = http://copr-dist-git-dev.fedorainfracloud.org/repo/pkgs -lookasidehash = md5 -lookaside_cgi = https://copr-dist-git-dev.fedorainfracloud.org/repo/pkgs/upload.cgi -gitbaseurl = ssh://%(user)s@copr-dist-git-dev.fedorainfracloud.org/git/%(module)s -anongiturl = http://copr-dist-git-dev.fedorainfracloud.org/git/%(module)s.git -tracbaseurl = https://%(user)s:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc -branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$ -kojiconfig = /etc/koji.conf -build_client = koji - -[copr_builder] -branching = fedora -frontend_api = http://copr-fe-dev.cloud.fedoraproject.org/ - -[copr-cli] -copr_url = http://copr-fe-dev.cloud.fedoraproject.org diff --git a/builder/fedora-copr.conf b/builder/fedora-copr.conf deleted file mode 100644 index f212fac..0000000 --- a/builder/fedora-copr.conf +++ /dev/null @@ -1,17 +0,0 @@ -[rpkg] -lookaside = http://copr-dist-git.fedorainfracloud.org/repo/pkgs -lookasidehash = md5 -lookaside_cgi = https://copr-dist-git.fedorainfracloud.org/repo/pkgs/upload.cgi -gitbaseurl = ssh://%(user)s@copr-dist-git.fedorainfracloud.org/git/%(module)s -anongiturl = http://copr-dist-git.fedorainfracloud.org/git/%(module)s.git -tracbaseurl = https://%(user)s:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc -branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$ -kojiconfig = /etc/koji.conf -build_client = koji - -[copr_builder] -branching = fedora -frontend_api = https://copr.fedorainfracloud.org/ - -[copr-cli] -copr_url = https://copr.fedorainfracloud.org diff --git a/builder/rhcopr-dev.conf b/builder/rhcopr-dev.conf deleted file mode 100644 index 6316e2d..0000000 --- a/builder/rhcopr-dev.conf +++ /dev/null @@ -1,17 +0,0 @@ -[rpkg] -lookaside = http://dev-copr-dist-git.devel.redhat.com/repo/pkgs -lookasidehash = md5 -lookaside_cgi = https://dev-copr-dist-git.devel.redhat.com/repo/pkgs/upload.cgi -gitbaseurl = ssh://%(user)s@dev-copr-dist-git.devel.redhat.com/git/%(module)s -anongiturl = https://dev-copr-dist-git.devel.redhat.com/git/%(module)s.git -tracbaseurl = https://%(user)s:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc -branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$ -kojiconfig = /etc/koji.conf -build_client = koji - -[copr_builder] -branching = slash -frontend_api = https://dev-copr.devel.redhat.com/ - -[copr-cli] -copr_url = https://dev-copr.devel.redhat.com diff --git a/builder/rhcopr-stg.conf b/builder/rhcopr-stg.conf deleted file mode 100644 index b9bdd9d..0000000 --- a/builder/rhcopr-stg.conf +++ /dev/null @@ -1,17 +0,0 @@ -[rpkg] -lookaside = http://stg-copr-dist-git.devel.redhat.com/repo/pkgs -lookasidehash = md5 -lookaside_cgi = https://stg-copr-dist-git.devel.redhat.com/repo/pkgs/upload.cgi -gitbaseurl = ssh://%(user)s@stg-copr-dist-git.devel.redhat.com/git/%(module)s -anongiturl = https://stg-copr-dist-git.devel.redhat.com/git/%(module)s.git -tracbaseurl = https://%(user)s:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc -branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$ -kojiconfig = /etc/koji.conf -build_client = koji - -[copr_builder] -branching = slash -frontend_api = https://stg-copr.devel.redhat.com/ - -[copr-cli] -copr_url = https://stg-copr.devel.redhat.com diff --git a/builder/rhcopr.conf b/builder/rhcopr.conf deleted file mode 100644 index 7c4eb04..0000000 --- a/builder/rhcopr.conf +++ /dev/null @@ -1,17 +0,0 @@ -[rpkg] -lookaside = http://copr-dist-git.devel.redhat.com/repo/pkgs -lookasidehash = md5 -lookaside_cgi = https://copr-dist-git.devel.redhat.com/repo/pkgs/upload.cgi -gitbaseurl = ssh://%(user)s@copr-dist-git.devel.redhat.com/git/%(module)s -anongiturl = https://copr-dist-git.devel.redhat.com/git/%(module)s.git -tracbaseurl = https://%(user)s:%(password)s@fedorahosted.org/rel-eng/login/xmlrpc -branchre = f\d$|f\d\d$|el\d$|olpc\d$|master$ -kojiconfig = /etc/koji.conf -build_client = koji - -[copr_builder] -branching = slash -frontend_api = https://copr.devel.redhat.com/ - -[copr-cli] -copr_url = https://copr.devel.redhat.com diff --git a/builder/rpkg b/builder/rpkg deleted file mode 100755 index 117e74c..0000000 --- a/builder/rpkg +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/python -# rpkg - a script to interact with the Red Hat Packaging system -# -# Copyright (C) 2011 Red Hat Inc. -# Author(s): Jesse Keating -# -# We got this file from 'python2-rpkg' where it is used as documentation file. -# Have a look at rhbz#1452202. -# -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation; either version 2 of the License, or (at your -# option) any later version. See http://www.gnu.org/copyleft/gpl.html for -# the full text of the license. - -import pyrpkg -import pyrpkg.cli -import pyrpkg.utils -import os -import sys -import logging -from six.moves import configparser -import argparse - -# Setup an argparser and parse the known commands to get the config file -parser = argparse.ArgumentParser(add_help=False) -parser.add_argument('-C', '--config', help='Specify a config file to use', - default='/etc/rpkg/rpkg.conf') - -(args, other) = parser.parse_known_args() - -# Make sure we have a sane config file -if not os.path.exists(args.config) and not other[-1] in ['--help', '-h']: - sys.stderr.write('Invalid config file %s\n' % args.config) - sys.exit(1) - -# Setup a configuration object and read config file data -config = configparser.SafeConfigParser() -config.read(args.config) - -client = pyrpkg.cli.cliClient(config, name='rpkg') -client.do_imports() -client.parse_cmdline() - -if not client.args.path: - try: - client.args.path = pyrpkg.utils.getcwd() - except: - print('Could not get current path, have you deleted it?') - sys.exit(1) - -# setup the logger -- This logger will take things of INFO or DEBUG and -# log it to stdout. Anything above that (WARN, ERROR, CRITICAL) will go -# to stderr. Normal operation will show anything INFO and above. -# Quiet hides INFO, while Verbose exposes DEBUG. In all cases WARN or -# higher are exposed (via stderr). -log = pyrpkg.log -client.setupLogging(log) - -if client.args.v: - log.setLevel(logging.DEBUG) -elif client.args.q: - log.setLevel(logging.WARNING) -else: - log.setLevel(logging.INFO) - -# Run the necessary command -try: - sys.exit(client.args.command()) -except KeyboardInterrupt: - pass