This is an automated email from the git hooks/post-receive script.
praiskup pushed a change to branch master in repository copr/copr.
from 23e39cc [frontend] implement pinned projects feature new 1e73cd6 beaker-tests-sanity: don't use 'master' platform new 1abc7b3 beaker-tests-sanity: use current chroot defined in config new 6a7a4c0 beaker-tests-sanity: use a newer module, F28 is disabled now new 421cd38 beaker-tests-sanity: install rpm-build for runtest-modules.sh new ab19760 frontend: create module repos only for chroots that it was built in new 401fb55 backend: remove assert from the appstream createrepo new 8519cae beaker-tests-sanity: fix the way of checking whether a module is visible on the system new 590c4c3 beaker-tests-sanity: assume yes when enabling module
The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: backend/backend/createrepo.py | 1 - beaker-tests/Install/Config-copr-cli/runtest.sh | 1 + .../Sanity/copr-cli-basic-operations/config | 1 + .../files/coprtestmodule.yaml | 6 ++--- .../files/test-macros-module.yaml | 4 +-- .../files/testmodule.yaml | 4 +-- .../copr-cli-basic-operations/runtest-modules.sh | 29 +++++++++++++--------- .../coprs_frontend/coprs/logic/actions_logic.py | 3 ++- 8 files changed, 28 insertions(+), 21 deletions(-)
This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master in repository copr/copr.
commit 1e73cd6137b786a935c5bb433908df09033cb8b9 Author: Jakub Kadlcik frostyx@email.cz AuthorDate: Thu Jun 27 00:45:29 2019 +0200
beaker-tests-sanity: don't use 'master' platform --- beaker-tests/Sanity/copr-cli-basic-operations/config | 1 + .../Sanity/copr-cli-basic-operations/files/coprtestmodule.yaml | 6 +++--- .../Sanity/copr-cli-basic-operations/files/test-macros-module.yaml | 4 ++-- beaker-tests/Sanity/copr-cli-basic-operations/files/testmodule.yaml | 4 ++-- beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh | 4 ++++ 5 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/config b/beaker-tests/Sanity/copr-cli-basic-operations/config index 71c475b..3242ca7 100644 --- a/beaker-tests/Sanity/copr-cli-basic-operations/config +++ b/beaker-tests/Sanity/copr-cli-basic-operations/config @@ -25,6 +25,7 @@ USER=`copr-cli whoami` # as this script is going to be run from FEDORA_VERSION=30 CHROOT="fedora-$FEDORA_VERSION-x86_64" +BRANCH="f$FEDORA_VERSION"
# Useful paths diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/files/coprtestmodule.yaml b/beaker-tests/Sanity/copr-cli-basic-operations/files/coprtestmodule.yaml index 7289310..b028a08 100644 --- a/beaker-tests/Sanity/copr-cli-basic-operations/files/coprtestmodule.yaml +++ b/beaker-tests/Sanity/copr-cli-basic-operations/files/coprtestmodule.yaml @@ -10,9 +10,9 @@ data: module: [ MIT ] dependencies: buildrequires: - platform: master + platform: $PLATFORM requires: - platform: master + platform: $PLATFORM references: community: https://fedoraproject.org/wiki/Modularity documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules @@ -28,5 +28,5 @@ data: rpms: ed: rationale: An example of Copr package - ref: master + ref: $PLATFORM repository: 'http://copr-dist-git-dev.fedorainfracloud.org/git/$OWNER/$PROJECT/ed.git' diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/files/test-macros-module.yaml b/beaker-tests/Sanity/copr-cli-basic-operations/files/test-macros-module.yaml index 9281033..efdb325 100644 --- a/beaker-tests/Sanity/copr-cli-basic-operations/files/test-macros-module.yaml +++ b/beaker-tests/Sanity/copr-cli-basic-operations/files/test-macros-module.yaml @@ -10,9 +10,9 @@ data: module: [ MIT ] dependencies: buildrequires: - platform: master + platform: $PLATFORM requires: - platform: master + platform: $PLATFORM references: community: https://fedoraproject.org/wiki/Modularity documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/files/testmodule.yaml b/beaker-tests/Sanity/copr-cli-basic-operations/files/testmodule.yaml index 1b8a218..9a33a13 100644 --- a/beaker-tests/Sanity/copr-cli-basic-operations/files/testmodule.yaml +++ b/beaker-tests/Sanity/copr-cli-basic-operations/files/testmodule.yaml @@ -10,9 +10,9 @@ data: module: [ MIT ] dependencies: buildrequires: - platform: master + platform: $PLATFORM requires: - platform: master + platform: $PLATFORM references: community: https://fedoraproject.org/wiki/Modularity documentation: https://fedoraproject.org/wiki/Fedora_Packaging_Guidelines_for_Modules diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh index e8a2c51..ea297df 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh @@ -99,6 +99,7 @@ rlJournalStart copr-cli create $PROJECT --chroot fedora-rawhide-x86_64 --chroot fedora-rawhide-i386 yes | cp $HERE/files/testmodule.yaml /tmp sed -i "s/$VERSION/$DATE/g" /tmp/testmodule.yaml + sed -i "s/$PLATFORM/$BRANCH/g" /tmp/testmodule.yaml rlRun "copr-cli build-module --yaml /tmp/testmodule.yaml $PROJECT"
# Test module duplicity @@ -132,6 +133,7 @@ rlJournalStart copr-cli create $PROJECT --chroot fedora-rawhide-x86_64 --chroot fedora-rawhide-i386 yes | cp $HERE/files/test-macros-module.yaml /tmp sed -i "s/$VERSION/$DATE/g" /tmp/test-macros-module.yaml + sed -i "s/$PLATFORM/$BRANCH/g" /tmp/test-macros-module.yaml copr-cli build-module --yaml /tmp/test-macros-module.yaml $PROJECT PACKAGES=`mktemp` wait_for_finished_module "module-test-macros-module-beakertest-$DATE" 1 600 $PACKAGES @@ -158,6 +160,7 @@ rlJournalStart copr-cli create $PROJECT --chroot fedora-rawhide-x86_64 --chroot fedora-rawhide-i386 yes | cp $HERE/files/testmodule.yaml /tmp sed -i "s/$VERSION/$DATE$SUFFIX/g" /tmp/testmodule.yaml + sed -i "s/$PLATFORM/$BRANCH/g" /tmp/testmodule.yaml rlRun "copr-cli build-module --yaml /tmp/testmodule.yaml $PROJECT" wait_for_finished_module "$OWNER/TestModule$DATE$SUFFIX" 2 600 $PACKAGES test_successful_packages "ed mksh" $PACKAGES @@ -167,6 +170,7 @@ rlJournalStart copr-cli create $PROJECT --chroot fedora-rawhide-x86_64 --chroot fedora-rawhide-i386 yes | cp $HERE/files/coprtestmodule.yaml /tmp sed -i "s/$VERSION/$DATE/g" /tmp/coprtestmodule.yaml + sed -i "s/$PLATFORM/$BRANCH/g" /tmp/coprtestmodule.yaml sed -i "s/$OWNER/$USER/g" /tmp/coprtestmodule.yaml sed -i "s/$PROJECT/module-testmodule-beakertest-$DATE/g" /tmp/coprtestmodule.yaml rlRun "copr-cli build-module --yaml /tmp/coprtestmodule.yaml $PROJECT"
This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master in repository copr/copr.
commit 1abc7b37e54a1d2770f45ba1e5b3e9e62f8ec7c2 Author: Jakub Kadlcik frostyx@email.cz AuthorDate: Thu Jun 27 01:25:35 2019 +0200
beaker-tests-sanity: use current chroot defined in config --- .../Sanity/copr-cli-basic-operations/runtest-modules.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh index ea297df..c811ce8 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh @@ -96,7 +96,7 @@ rlJournalStart
# Test yaml submit PROJECT=module-testmodule-beakertest-$DATE - copr-cli create $PROJECT --chroot fedora-rawhide-x86_64 --chroot fedora-rawhide-i386 + copr-cli create $PROJECT --chroot $CHROOT --chroot fedora-rawhide-i386 yes | cp $HERE/files/testmodule.yaml /tmp sed -i "s/$VERSION/$DATE/g" /tmp/testmodule.yaml sed -i "s/$PLATFORM/$BRANCH/g" /tmp/testmodule.yaml @@ -118,7 +118,7 @@ rlJournalStart
# Test URL submit PROJECT=module-testmoduleurl-beakertest-$DATE - copr-cli create $PROJECT --chroot fedora-rawhide-x86_64 --chroot fedora-rawhide-i386 + copr-cli create $PROJECT --chroot $CHROOT --chroot fedora-rawhide-i386 rlRun "copr-cli build-module --url https://src.fedoraproject.org/modules/testmodule/raw/f28/f/testmodule.yaml $PROJECT" PACKAGES=`mktemp` wait_for_finished_module "module-testmoduleurl-beakertest-$DATE" 3 600 $PACKAGES @@ -130,7 +130,7 @@ rlJournalStart
# Test that user-defined macros are in the buildroot PROJECT=module-test-macros-module-beakertest-$DATE - copr-cli create $PROJECT --chroot fedora-rawhide-x86_64 --chroot fedora-rawhide-i386 + copr-cli create $PROJECT --chroot $CHROOT --chroot fedora-rawhide-i386 yes | cp $HERE/files/test-macros-module.yaml /tmp sed -i "s/$VERSION/$DATE/g" /tmp/test-macros-module.yaml sed -i "s/$PLATFORM/$BRANCH/g" /tmp/test-macros-module.yaml @@ -144,7 +144,7 @@ rlJournalStart TMP=`mktemp -d` MACROS=`mktemp` copr-cli download-build --dest $TMP $ID - rpm -qp --queryformat '%{DESCRIPTION}' $TMP/fedora-rawhide-x86_64/test-macros-1.0-*src.rpm |grep MACRO > $MACROS + rpm -qp --queryformat '%{DESCRIPTION}' $TMP/$CHROOT/test-macros-1.0-*src.rpm |grep MACRO > $MACROS
# @FIXME There is a known regression - user macros from modulemd are # not used in the buildroot. @@ -157,7 +157,7 @@ rlJournalStart PACKAGES=`mktemp` SUFFIX=2 PROJECT=$OWNER/TestModule$DATE$SUFFIX - copr-cli create $PROJECT --chroot fedora-rawhide-x86_64 --chroot fedora-rawhide-i386 + copr-cli create $PROJECT --chroot $CHROOT --chroot fedora-rawhide-i386 yes | cp $HERE/files/testmodule.yaml /tmp sed -i "s/$VERSION/$DATE$SUFFIX/g" /tmp/testmodule.yaml sed -i "s/$PLATFORM/$BRANCH/g" /tmp/testmodule.yaml @@ -167,7 +167,7 @@ rlJournalStart
# Test that it is possible to build module with package from copr PROJECT=module-coprtestmodule-beakertest-$DATE - copr-cli create $PROJECT --chroot fedora-rawhide-x86_64 --chroot fedora-rawhide-i386 + copr-cli create $PROJECT --chroot $CHROOT --chroot fedora-rawhide-i386 yes | cp $HERE/files/coprtestmodule.yaml /tmp sed -i "s/$VERSION/$DATE/g" /tmp/coprtestmodule.yaml sed -i "s/$PLATFORM/$BRANCH/g" /tmp/coprtestmodule.yaml @@ -187,7 +187,7 @@ rlJournalStart # Test that module can be enabled with dnf # Module repository should be allowed via DNF, but the code isn't merged yet # https://github.com/rpm-software-management/dnf-plugins-core/pull/214 - rlRun "curl $FRONTEND_URL/coprs/$USER/module-testmodule-beakertest-$DATE/module_repo/fedora-rawhide/testmodule-beakertest-$DATE.repo > /etc/yum.repos.d/testmodule.repo" + rlRun "curl $FRONTEND_URL/coprs/$USER/module-testmodule-beakertest-$DATE/module_repo/fedora-$FEDORA_VERSION/testmodule-beakertest-$DATE.repo > /etc/yum.repos.d/testmodule.repo"
rlAssertEquals "Module should be visible in the system" `dnf module list |grep testmodule |grep beakertest |grep $DATE |grep -v "Copr modules repo" |wc -l` 1 rlRun "dnf module enable testmodule:beakertest"
This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master in repository copr/copr.
commit 6a7a4c0fd99c1301c4aa26c8b0e68520034d7423 Author: Jakub Kadlcik frostyx@email.cz AuthorDate: Fri Jul 26 11:56:24 2019 +0200
beaker-tests-sanity: use a newer module, F28 is disabled now
We can't use the testmodule from `f30` branch because it is defined within modulemd version 2, which is not supported by Copr yet.
See #875
This particular `testmodule.yaml` is exactly the same as the `f30` one except it is defined in modulemd version 1. --- beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh index c811ce8..4ab4c95 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh @@ -119,10 +119,10 @@ rlJournalStart # Test URL submit PROJECT=module-testmoduleurl-beakertest-$DATE copr-cli create $PROJECT --chroot $CHROOT --chroot fedora-rawhide-i386 - rlRun "copr-cli build-module --url https://src.fedoraproject.org/modules/testmodule/raw/f28/f/testmodule.yaml $PROJECT" + rlRun "copr-cli build-module --url https://src.fedoraproject.org/modules/testmodule/raw/fancy/f/testmodule.yaml $PROJECT" PACKAGES=`mktemp` - wait_for_finished_module "module-testmoduleurl-beakertest-$DATE" 3 600 $PACKAGES - test_successful_packages "perl-List-Compare perl-Tangerine tangerine" $PACKAGES + wait_for_finished_module "module-testmoduleurl-beakertest-$DATE" 1 600 $PACKAGES + test_successful_packages "perl-List-Compare" $PACKAGES
# @TODO Test that module succeeded # We need to implement API for retrieving modules or at least
This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master in repository copr/copr.
commit 421cd38a5b450811b37cd72b4c1fe6cfc187d1fb Author: Jakub Kadlcik frostyx@email.cz AuthorDate: Fri Jul 26 01:00:08 2019 +0200
beaker-tests-sanity: install rpm-build for runtest-modules.sh --- beaker-tests/Install/Config-copr-cli/runtest.sh | 1 + 1 file changed, 1 insertion(+)
diff --git a/beaker-tests/Install/Config-copr-cli/runtest.sh b/beaker-tests/Install/Config-copr-cli/runtest.sh index 2e7e353..3e1678a 100755 --- a/beaker-tests/Install/Config-copr-cli/runtest.sh +++ b/beaker-tests/Install/Config-copr-cli/runtest.sh @@ -44,6 +44,7 @@ rlJournalStart rlRun "dnf config-manager --set-enabled fedora --save" rlRun "dnf install -y python3-copr copr-cli" rlRun "dnf upgrade python3-copr copr-cli" + rlRun "dnf install rpm-build"
cat > /etc/dnf/plugins/copr.d/tested-copr.conf <<EOF [tested-copr]
This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master in repository copr/copr.
commit ab19760173d613d011d15782761249189c7aac8c Author: Jakub Kadlcik frostyx@email.cz AuthorDate: Fri Jul 26 01:48:36 2019 +0200
frontend: create module repos only for chroots that it was built in
Instead creating them for all enabled chroots in the project. --- frontend/coprs_frontend/coprs/logic/actions_logic.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/frontend/coprs_frontend/coprs/logic/actions_logic.py b/frontend/coprs_frontend/coprs/logic/actions_logic.py index c7448b4..e648e6d 100644 --- a/frontend/coprs_frontend/coprs/logic/actions_logic.py +++ b/frontend/coprs_frontend/coprs/logic/actions_logic.py @@ -227,8 +227,9 @@ class ActionsLogic(object): :type modulemd: str content of module yaml file """
+ mock_chroots = set.intersection(*[set(b.chroots) for b in module.builds]) data = { - "chroots": [c.name for c in copr.active_chroots], + "chroots": [ch.name for ch in mock_chroots], "builds": [b.id for b in module.builds], }
This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master in repository copr/copr.
commit 401fb55a15f357f83c8156ff672c6e08b3a0baab Author: Jakub Kadlcik frostyx@email.cz AuthorDate: Fri Jul 26 04:03:10 2019 +0200
backend: remove assert from the appstream createrepo
It was questionable to add it there in the first place and it doesn't work in module builds, so let's just get rid of that. --- backend/backend/createrepo.py | 1 - 1 file changed, 1 deletion(-)
diff --git a/backend/backend/createrepo.py b/backend/backend/createrepo.py index cbc634d..9535b34 100644 --- a/backend/backend/createrepo.py +++ b/backend/backend/createrepo.py @@ -125,7 +125,6 @@ def add_appdata(path, username, projectname, lock=None): if ":" in os.path.basename(parent_dir): return out
- assert parent_dir.endswith(os.path.join(username, projectname)) if os.path.exists(os.path.join(parent_dir, ".disable-appstream")): return out
This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master in repository copr/copr.
commit 8519caec2735f0292e30768b855c1bcbc4d5530e Author: Jakub Kadlcik frostyx@email.cz AuthorDate: Fri Jul 26 10:02:22 2019 +0200
beaker-tests-sanity: fix the way of checking whether a module is visible on the system
The output of `dnf module list` have probably changed because now the test doesn't make any sense. There is no version number on this line. --- beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh index 4ab4c95..cdba74f 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh @@ -189,7 +189,8 @@ rlJournalStart # https://github.com/rpm-software-management/dnf-plugins-core/pull/214 rlRun "curl $FRONTEND_URL/coprs/$USER/module-testmodule-beakertest-$DATE/module_repo/fedora-$FEDORA_VERSION/testmodule-beakertest-$DATE.repo > /etc/yum.repos.d/testmodule.repo"
- rlAssertEquals "Module should be visible in the system" `dnf module list |grep testmodule |grep beakertest |grep $DATE |grep -v "Copr modules repo" |wc -l` 1 + rlAssertEquals "Module should be visible in the system" `dnf module list |grep testmodule |grep beakertest |grep -v "Copr modules repo" |wc -l` 1 + rlAssertEquals "Module should be available in the correct version" `dnf module info testmodule:beakertest |grep Version |grep $DATE |wc -l` 1 rlRun "dnf module enable testmodule:beakertest" rlRun "dnf -y module install testmodule/default" rlRun "rpm -q mksh"
This is an automated email from the git hooks/post-receive script.
praiskup pushed a commit to branch master in repository copr/copr.
commit 590c4c3f8b6f64a36f0e7f5e85849a53ff81c9b9 Author: Jakub Kadlcik frostyx@email.cz AuthorDate: Fri Jul 26 10:19:37 2019 +0200
beaker-tests-sanity: assume yes when enabling module --- beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh index cdba74f..bb38de5 100755 --- a/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh +++ b/beaker-tests/Sanity/copr-cli-basic-operations/runtest-modules.sh @@ -191,7 +191,7 @@ rlJournalStart
rlAssertEquals "Module should be visible in the system" `dnf module list |grep testmodule |grep beakertest |grep -v "Copr modules repo" |wc -l` 1 rlAssertEquals "Module should be available in the correct version" `dnf module info testmodule:beakertest |grep Version |grep $DATE |wc -l` 1 - rlRun "dnf module enable testmodule:beakertest" + rlRun "dnf -y module enable testmodule:beakertest" rlRun "dnf -y module install testmodule/default" rlRun "rpm -q mksh" rlRun "dnf -y module remove testmodule:beakertest/default"
copr-commits@lists.fedorahosted.org