From 273fa333112b16811d15755ebe55defb9508c073 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Mon, 3 Sep 2018 13:47:14 +0300 Subject: Add repository-type value to task manifest and rename repository value to repository-url --- tests/agent/testscript | 6 ++++-- tests/integration/testscript | 14 +++++++++----- tests/machine/testscript | 6 ++++-- tests/worker/build.test | 22 +++++++++++++--------- tests/worker/startup.test | 9 ++++++--- 5 files changed, 36 insertions(+), 21 deletions(-) (limited to 'tests') diff --git a/tests/agent/testscript b/tests/agent/testscript index 0a203fc..1edb728 100644 --- a/tests/agent/testscript +++ b/tests/agent/testscript @@ -131,7 +131,8 @@ rm = $src_base/btrfs-rmdir /build/machines : 1 name: foo version: 1.2.3 - repository: https://example.org/1/ + repository-url: https://example.org/1/ + repository-type: pkg machine: windows-msvc target: x86_64-microsoft-win32-msvc14.1 EOI @@ -145,7 +146,8 @@ rm = $src_base/btrfs-rmdir /build/machines : 1 name: foo version: 1.2.3 - repository: https://example.org/1/ + repository-url: https://example.org/1/ + repository-type: pkg machine: linux-gcc target: x86_64-linux-gnu EOI diff --git a/tests/integration/testscript b/tests/integration/testscript index 9406c43..43f77a2 100644 --- a/tests/integration/testscript +++ b/tests/integration/testscript @@ -50,22 +50,25 @@ controller = --fake-request ../task --dump-result pkg = libhello ver = 1.0.0 -#rep = https://build2.org/pkg/1/hello/stable +#rep_url = https://build2.org/pkg/1/hello/stable #rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30:56:B9:77:B9:F2:01:94 -rep = https://hello.stage.build2.org/1/stable/ +rep_url = https://hello.stage.build2.org/1/stable/ +rep_type = pkg rfp = yes #\ pkg = bpkg ver = 0.6.0-a.0.1499870184.53fff46c5e5fd4df -rep = https://stage.build2.org/1 +rep_url = https://stage.build2.org/1 +rep_type = pkg rfp = 37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2:B0:6C:EF:66:A4:BE:65 #\ #\ pkg = build2 ver = 0.6.0-a.0.1500478402.30578be48463b93f -rep = https://stage.build2.org/1 +rep_url = https://stage.build2.org/1 +rep_type = pkg rfp = 37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2:B0:6C:EF:66:A4:BE:65 #\ @@ -83,7 +86,8 @@ b.test-installed:--progress" : 1 name: $pkg version: $ver - repository: $rep + repository-url: $rep_url + repository-type: $rep_type trust: $rfp machine: $machine target: $target diff --git a/tests/machine/testscript b/tests/machine/testscript index 1dcf5d7..52373bd 100644 --- a/tests/machine/testscript +++ b/tests/machine/testscript @@ -18,7 +18,8 @@ toolchain_trust = 37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34 pkg = hello ver = 1.0.0 -rep = https://hello.stage.build2.org/1/stable +rep_url = https://hello.stage.build2.org/1/stable +rep_type = pkg rfp = 37:CE:2C:A5:1D:CF:93:81:D7:07:46:AD:66:B3:C3:90:83:B8:96:9E:34:F0:E7:B3:A2:B0:6C:EF:66:A4:BE:65 # @@ There is currently no way to obtain a valid (default?) target for the @@ -88,7 +89,8 @@ test.options += --machines $machines --toolchain-id $checksum : 1 name: $pkg version: $ver - repository: $rep + repository-url: $rep_url + repository-type: $rep_type trust: $rfp machine: $machine target: $target diff --git a/tests/worker/build.test b/tests/worker/build.test index c2829e6..23d5b36 100644 --- a/tests/worker/build.test +++ b/tests/worker/build.test @@ -9,9 +9,10 @@ tftp = 127.0.0.1:55123/test pkg = hello ver = 1.0.0 -#rep = /home/boris/work/build2/hello/repository/1/stable -rep = https://build2.org/pkg/1/stage/stable -#rep = https://build2.org/pkg/1/hello/stable +#rep_url = /home/boris/work/build2/hello/repository/1/stable +rep_url = https://build2.org/pkg/1/stage/stable +#rep_url = https://build2.org/pkg/1/hello/stable +rep_type = pkg rfp = FF:DF:7D:38:67:4E:C3:82:65:7E:EE:1F:D4:80:EC:56:C4:33:5B:65:3F:9B:29:9A:30:56:B9:77:B9:F2:01:94 @@ -21,7 +22,8 @@ cat <<"EOI" >=manifest; : 1 name: $pkg version: $ver - repository: $rep + repository-url: $rep_url + repository-type: $rep_type trust: $rfp machine: linux-gcc target: x86_64-linux-gnu @@ -29,7 +31,7 @@ cat <<"EOI" >=manifest; EOI $* --verbose 3 --tftp-host "$tftp/$@" cc &x86_64-linux-gnu/*** 2>>"EOE"; trace: build: bpkg -v create -d x86_64-linux-gnu --wipe config.cc.coptions=-O3 cc - trace: build: bpkg -v add $rep + trace: build: bpkg -v add $rep_url trace: build: bpkg -v fetch --trust $rfp --trust-no trace: build: bpkg -v build --configure-only --yes $pkg/$ver trace: build: bpkg -v update $pkg @@ -73,14 +75,15 @@ cat <<"EOI" >=manifest; : 1 name: bogus version: 1.2.3 - repository: $rep + repository-url: $rep_url + repository-type: $rep_type trust: $rfp machine: linux-gcc target: x86_64-linux-gnu EOI $* --verbose 3 --tftp-host "$tftp/$@" cc &x86_64-linux-gnu/*** 2>>"EOE"; trace: build: bpkg -v create -d x86_64-linux-gnu --wipe cc - trace: build: bpkg -v add $rep + trace: build: bpkg -v add $rep_url trace: build: bpkg -v fetch --trust $rfp --trust-no trace: build: bpkg -v build --configure-only --yes bogus/1.2.3 trace: build: curl -s -S --upload-file - --max-time 10 tftp://$tftp/$@/manifest @@ -103,7 +106,8 @@ cat <<"EOI" >=manifest; : 1 name: $pkg version: $ver - repository: $rep + repository-url: $rep_url + repository-type: $rep_type trust: $rfp machine: linux-gcc target: x86_64-linux-gnu @@ -111,7 +115,7 @@ cat <<"EOI" >=manifest; EOI $* --verbose 3 --tftp-host "$tftp/$@" cc &x86_64-linux-gnu/*** 2>>"EOE"; trace: build: bpkg -v create -d x86_64-linux-gnu --wipe config.cc.loptions=-lbogus cc - trace: build: bpkg -v add $rep + trace: build: bpkg -v add $rep_url trace: build: bpkg -v fetch --trust $rfp --trust-no trace: build: bpkg -v build --configure-only --yes $pkg/$ver trace: build: bpkg -v update $pkg diff --git a/tests/worker/startup.test b/tests/worker/startup.test index 550d8fd..8e8dcf5 100644 --- a/tests/worker/startup.test +++ b/tests/worker/startup.test @@ -39,7 +39,8 @@ cat <=manifest; : 1 name: libhello version: 1.2.3 - repository: https://pkg.example.org/1/ + repository-url: https://pkg.example.org/1/ + repository-type: pkg machine: linux-gcc target: x86_64-linux-gnu EOI @@ -65,7 +66,8 @@ cat <=manifest; : 1 name: libhello version: 1.2.3 - repository: https://pkg.example.org/1/ + repository-url: https://pkg.example.org/1/ + repository-type: pkg machine: linux-gcc target: x86_64-linux-gnu EOI @@ -92,7 +94,8 @@ cat <=manifest; : 1 name: libhello version: 1.2.3 - repository: https://pkg.example.org/1/ + repository-url: https://pkg.example.org/1/ + repository-type: pkg machine: linux-gcc target: x86_64-linux-gnu EOI -- cgit v1.1