diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2d72a2f0529a8dc9d3be78238bfb7f752b53ea6..910d7fecdb5c2164811701b8e101582c8278c9f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,12 +138,12 @@ test-package-source-builder: - test "$(pristine-lfs list | wc -l)" = 2 - cd .. - git clone https://gitlab.apertis.org/infrastructure/test-data/fixture-dash-unmodified - - ": Verify we correctly detect when there are no local changes and use the co0 suffix" + - ": Verify we correctly detect when there are no local changes and use the apertis0 suffix" - cd fixture-dash-unmodified - apertis-pkg-merge-updates --package dash --upstream debian/buster --downstream apertis/v2020dev0 - git log --graph --oneline --decorate - git diff debian/buster.. - - test "$(dpkg-parsechangelog -SVersion)" = 0.5.10.2-5co0 + - test "$(dpkg-parsechangelog -SVersion)" = 0.5.10.2-5apertis0 - test "$(dpkg-parsechangelog -SDistribution)" = apertis - cd .. - rm -rf fixture-dash-unmodified @@ -162,7 +162,7 @@ test-package-source-builder: - apertis-pkg-merge-updates --package dash --upstream debian/buster --downstream apertis/v2020dev0 - git log --graph --oneline --decorate - git diff debian/buster.. - - test "$(dpkg-parsechangelog -SVersion)" = 0.5.10.2-5co1 + - test "$(dpkg-parsechangelog -SVersion)" = 0.5.10.2-5apertis1 - test "$(dpkg-parsechangelog -SDistribution)" = UNRELEASED - cd .. diff --git a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-updates b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-updates index 11302f687837a0fb0b7c188972194443d49e5568..dad4f9bd7cd86c52a57905980b7fffa96e287f8f 100755 --- a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-updates +++ b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-updates @@ -94,7 +94,7 @@ def main(): parser.add_argument('--package', dest='package', type=str, help='the package name (e.g. glib2.0)') # TODO: figure this out from the repo parser.add_argument('--downstream', dest='downstream', type=str, help='the downstream branch (e.g. apertis/v2020dev0)') parser.add_argument('--upstream', dest='upstream', type=str, required=True, help='the upstream branch (e.g. debian/buster)') - parser.add_argument('--local-version-suffix', dest="local_suffix", type=str, default="co", help='the local version suffix to be used in the new changelog entry') + parser.add_argument('--local-version-suffix', dest="local_suffix", type=str, default="apertis", help='the local version suffix to be used in the new changelog entry') args = parser.parse_args() package_name = args.package diff --git a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams index 8d7ade889d8817b49a0bd2c0aa5bbec318c9178c..29eef00932629fad344a7833220258c59089d0d7 100755 --- a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams +++ b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams @@ -67,7 +67,7 @@ def main(): required=True, help='the upstream branch (e.g. debian/buster)') parser.add_argument('--downstreams', dest='downstreams', type=str, required=True, help='downstream branches, colon seperate (e.g. apertis/v2020dev0:apertis/v2019)') - parser.add_argument('--local-version-suffix', dest="local_suffix", type=str, default="co", help='the local version suffix to be used in new changelog entries') + parser.add_argument('--local-version-suffix', dest="local_suffix", type=str, default="apertis", help='the local version suffix to be used in new changelog entries') parser.add_argument('project_url', type=str, help='git project url to push updates to') args = parser.parse_args()