vincent/aptly
1
0
Fork 0
mirror of https://github.com/aptly-dev/aptly.git synced 2026-06-04 05:10:40 +00:00
Code Issues Projects Releases Wiki Activity

Added support for NotAutomatic, ButAutomaticUpgrades and Origin fields

Browse Source
This commit is contained in:
Oliver Sauder
2017-05-23 15:30:57 +02:00
parent 39293d7faf
commit e3f1880ad4
33 changed files with 171 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/t05_snapshot/DropSnapshot4Test_gold
+1 -1
View File
@@ -1,3 +1,3 @@
Snapshot `snap1` is published currently:
* ./maverick [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
* ./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
ERROR: unable to drop: snapshot is published
system/t05_snapshot/DropSnapshot5Test_gold
+1 -1
View File
@@ -1,3 +1,3 @@
Snapshot `snap1` is published currently:
* ./maverick [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
* ./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
ERROR: unable to drop: snapshot is published
system/t06_publish/FSEndpointPublishSnapshot9Test_gold
+2 -2
View File
@@ -1,4 +1,4 @@
Snapshot `snap1` is published currently:
* filesystem:hardlink:./maverick [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
* filesystem:symlink:./maverick [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
* filesystem:hardlink:./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
* filesystem:symlink:./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
ERROR: unable to drop: snapshot is published
system/t06_publish/PublishList2Test_gold
+1 -1
View File
@@ -1,5 +1,5 @@
Published repositories:
* ./maverick [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
* ./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
* ppa/maverick [amd64, i386] publishes {contrib: [snap2]: Merged from sources: 'snap1'}, {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
* ppa/smira/wheezy [amd64] publishes {contrib: [snap2]: Merged from sources: 'snap1'}
* ppa/tr1/maverick (origin: origin1) [amd64, i386] publishes {main: [snap2]: Merged from sources: 'snap1'}
system/t06_publish/PublishSnapshot13Test_release
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . maverick
Origin: LP-PPA-gladky-anton-gnuplot
Label: . maverick
Suite: maverick
Codename: maverick
system/t06_publish/PublishSnapshot15Test_release
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . maverick
Origin: LP-PPA-gladky-anton-gnuplot
Label: . maverick
Suite: maverick
Codename: maverick
system/t06_publish/PublishSnapshot16Test_release
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . maverick
Origin: LP-PPA-gladky-anton-gnuplot
Label: . maverick
Suite: maverick
Codename: maverick
system/t06_publish/PublishSnapshot1Test_release
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . maverick
Origin: LP-PPA-gladky-anton-gnuplot
Label: . maverick
Suite: maverick
Codename: maverick
system/t06_publish/PublishSnapshot1Test_release_amd64
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . maverick
Origin: LP-PPA-gladky-anton-gnuplot
Label: . maverick
Archive: maverick
Architecture: amd64
system/t06_publish/PublishSnapshot1Test_release_i386
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . maverick
Origin: LP-PPA-gladky-anton-gnuplot
Label: . maverick
Archive: maverick
Architecture: i386
system/t06_publish/PublishSnapshot24Test_release
+2
View File
@@ -2,6 +2,8 @@ Origin: aptly24
Label: . squeeze
Suite: squeeze
Codename: squeeze
NotAutomatic: yes
ButAutomaticUpgrades: yes
Architectures: amd64 i386
Components: main
Description: Generated by aptly
system/t06_publish/PublishSnapshot2Test_release
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . squeeze
Origin: LP-PPA-gladky-anton-gnuplot
Label: . squeeze
Suite: squeeze
Codename: squeeze
system/t06_publish/PublishSnapshot35Test_release
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . wheezy
Origin: Debian
Label: . wheezy
Suite: wheezy
Codename: wheezy
system/t06_publish/PublishSnapshot35Test_release_udeb_i386
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . wheezy
Origin: Debian
Label: . wheezy
Archive: wheezy
Architecture: i386
system/t06_publish/PublishSnapshot3Test_release
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . squeeze
Origin: LP-PPA-gladky-anton-gnuplot
Label: . squeeze
Suite: squeeze
Codename: squeeze
system/t06_publish/PublishSnapshot4Test_release
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . squeeze
Origin: LP-PPA-gladky-anton-gnuplot
Label: . squeeze
Suite: squeeze
Codename: squeeze
system/t06_publish/PublishSnapshot7Test_gold
+1 -1
View File
@@ -1 +1 @@
ERROR: prefix/distribution already used by another published repo: ./maverick [amd64, i386] publishes {main: [snap7]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
ERROR: prefix/distribution already used by another published repo: ./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap7]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
system/t06_publish/PublishSnapshot8Test_gold
+1 -1
View File
@@ -1 +1 @@
ERROR: prefix/distribution already used by another published repo: ppa/maverick [amd64, i386] publishes {main: [snap8]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
ERROR: prefix/distribution already used by another published repo: ppa/maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap8]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
system/t06_publish/PublishSwitch13Test_gold
+1 -1
View File
@@ -5,4 +5,4 @@ Signing file 'Release' with gpg, please enter your passphrase when prompted:
Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
Cleaning up prefix "." components main...
Publish for snapshot ./maverick [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot.
Publish for snapshot ./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot.
system/t06_publish/PublishSwitch1Test_gold
+1 -1
View File
@@ -5,4 +5,4 @@ Signing file 'Release' with gpg, please enter your passphrase when prompted:
Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
Cleaning up prefix "." components main...
Publish for snapshot ./maverick [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot.
Publish for snapshot ./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot.
system/t06_publish/PublishSwitch1Test_release
+1 -1
View File
@@ -1,4 +1,4 @@
Origin: . maverick
Origin: LP-PPA-gladky-anton-gnuplot
Label: . maverick
Suite: maverick
Codename: maverick
system/t06_publish/PublishSwitch3Test_gold
+1 -1
View File
@@ -5,4 +5,4 @@ Signing file 'Release' with gpg, please enter your passphrase when prompted:
Clearsigning file 'Release' with gpg, please enter your passphrase when prompted:
Cleaning up prefix "." components main...
Publish for snapshot ./maverick [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot.
Publish for snapshot ./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap3]: Pulled into 'snap2' with 'snap1' as source, pull request was: 'gnuplot-x11'} has been successfully switched to new snapshot.
system/t06_publish/snapshot.py
+2 -2
View File
@@ -608,14 +608,14 @@ class PublishSnapshot23Test(BaseTest):
class PublishSnapshot24Test(BaseTest):
"""
publish snapshot: custom origin
publish snapshot: custom origin, notautomatic and butautomaticupgrades
"""
fixtureDB = True
fixturePool = True
fixtureCmds = [
"aptly snapshot create snap24 from mirror gnuplot-maverick",
]
runCmd = "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=squeeze -origin=aptly24 snap24"
runCmd = "aptly publish snapshot -keyring=${files}/aptly.pub -secret-keyring=${files}/aptly.sec -distribution=squeeze -origin=aptly24 -notautomatic=yes -butautomaticupgrades=yes snap24"
gold_processor = BaseTest.expand_environ
def check(self):
system/t07_serve/Serve1Test_gold
+3 -3
View File
@@ -1,11 +1,11 @@
Serving published repositories, recommended apt sources list:
# ./maverick [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
# ./maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386] publishes {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
deb http://127.0.0.1:8765/ maverick main
# debian/maverick [amd64, i386, source] publishes {main: [snap2]: Snapshot from mirror [gnuplot-maverick-src]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick [src]}
# debian/maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386, source] publishes {main: [snap2]: Snapshot from mirror [gnuplot-maverick-src]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick [src]}
deb http://127.0.0.1:8765/debian/ maverick main
deb-src http://127.0.0.1:8765/debian/ maverick main
# multi/maverick [amd64, i386, source] publishes {contrib: [snap2]: Snapshot from mirror [gnuplot-maverick-src]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick [src]}, {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
# multi/maverick (origin: LP-PPA-gladky-anton-gnuplot) [amd64, i386, source] publishes {contrib: [snap2]: Snapshot from mirror [gnuplot-maverick-src]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick [src]}, {main: [snap1]: Snapshot from mirror [gnuplot-maverick]: http://ppa.launchpad.net/gladky-anton/gnuplot/ubuntu/ maverick}
deb http://127.0.0.1:8765/multi/ maverick contrib main
deb-src http://127.0.0.1:8765/multi/ maverick contrib main
system/t12_api/publish.py
+14
View File
@@ -40,6 +40,8 @@ class PublishAPITestRepo(APITest):
'Distribution': 'wheezy',
'Label': '',
'Origin': '',
'NotAutomatic': '',
'ButAutomaticUpgrades': '',
'Prefix': prefix,
'SkipContents': False,
'SourceKind': 'local',
@@ -74,6 +76,8 @@ class PublishAPITestRepo(APITest):
'Distribution': distribution,
'Label': '',
'Origin': '',
'NotAutomatic': '',
'ButAutomaticUpgrades': '',
'Prefix': ".",
'SkipContents': False,
'SourceKind': 'local',
@@ -120,6 +124,8 @@ class PublishSnapshotAPITest(APITest):
"Sources": [{"Name": snapshot_name}],
"Signing": DefaultSigningOptions,
"Distribution": "squeeze",
"NotAutomatic": "yes",
"ButAutomaticUpgrades": "yes",
})
self.check_equal(resp.status_code, 201)
self.check_equal(resp.json(), {
@@ -127,6 +133,8 @@ class PublishSnapshotAPITest(APITest):
'Distribution': 'squeeze',
'Label': '',
'Origin': '',
'NotAutomatic': 'yes',
'ButAutomaticUpgrades': 'yes',
'Prefix': prefix,
'SkipContents': False,
'SourceKind': 'snapshot',
@@ -188,6 +196,8 @@ class PublishUpdateAPITestRepo(APITest):
'Distribution': 'wheezy',
'Label': '',
'Origin': '',
'NotAutomatic': '',
'ButAutomaticUpgrades': '',
'Prefix': prefix,
'SkipContents': False,
'SourceKind': 'local',
@@ -239,6 +249,8 @@ class PublishSwitchAPITestRepo(APITest):
'Architectures': ['i386', 'source'],
'Distribution': 'wheezy',
'Label': '',
'NotAutomatic': '',
'ButAutomaticUpgrades': '',
'Origin': '',
'Prefix': prefix,
'SkipContents': False,
@@ -272,6 +284,8 @@ class PublishSwitchAPITestRepo(APITest):
'Distribution': 'wheezy',
'Label': '',
'Origin': '',
'NotAutomatic': '',
'ButAutomaticUpgrades': '',
'Prefix': prefix,
'SkipContents': True,
'SourceKind': 'snapshot',