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"