diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2018-09-03 13:47:14 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-09-03 13:47:14 +0300 |
| commit | 273fa333112b16811d15755ebe55defb9508c073 (patch) | |
| tree | 6cd353a1ecb02cff0826cd1994f69ff1d081b294 /tests/worker | |
| parent | 979cc6a6740f0174570923f2d968207b8eb1e16c (diff) | |
Add repository-type value to task manifest and rename repository value to repository-url
Diffstat (limited to 'tests/worker')
| -rw-r--r-- | tests/worker/build.test | 22 | ||||
| -rw-r--r-- | tests/worker/startup.test | 9 |
2 files changed, 19 insertions, 12 deletions
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 <<EOI >=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 <<EOI >=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 <<EOI >=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 |