refactor: reorganize and to end and smoke testing (#348)
1. we can merge the e2eminiooni.yml test into the miniooni.yml test so to reduce the number of tests we run; 2. ideally we would like the smoketest.sh test to evolve and also check whether we can fetch the measurements we submitted, so start moving this script into the `./E2E` folder, add a note saying we would like to do that, and direct all the tests to run this script at its new location and with its new name (`ooniprobe.sh`). With these two changes, it's fine to remove the ooniprobe2debian.yml test in ooni/e2etesting because we're moving its functionality to this repository. (We mentioned the need to do this move in a previous TODO comment at the top of such a script.) Work part of https://github.com/ooni/probe/issues/1468
This commit is contained in:
@@ -1,15 +0,0 @@
|
||||
# e2eminiooni runs end-to-end tests using miniooni
|
||||
name: "e2eminiooni"
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "master"
|
||||
jobs:
|
||||
test:
|
||||
runs-on: "ubuntu-20.04"
|
||||
steps:
|
||||
- uses: actions/setup-go@v1
|
||||
with:
|
||||
go-version: "1.16"
|
||||
- uses: actions/checkout@v2
|
||||
- run: ./E2E/miniooni.bash
|
||||
@@ -11,7 +11,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: ./mk OONI_PSIPHON_TAGS="" DEBIAN_TILDE_VERSION=$GITHUB_RUN_NUMBER ./debian/386
|
||||
- run: ./smoketest.sh ./CLI/linux/386/ooniprobe
|
||||
- run: ./E2E/ooniprobe.sh ./CLI/linux/386/ooniprobe
|
||||
- run: sudo apt-get install -y --no-install-recommends git python3 python3-requests python3-gnupg s3cmd
|
||||
- run: |
|
||||
for deb in *.deb; do
|
||||
@@ -27,7 +27,7 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: ./mk OONI_PSIPHON_TAGS="" DEBIAN_TILDE_VERSION=$GITHUB_RUN_NUMBER ./debian/amd64
|
||||
- run: ./smoketest.sh ./CLI/linux/amd64/ooniprobe
|
||||
- run: ./E2E/ooniprobe.sh ./CLI/linux/amd64/ooniprobe
|
||||
- run: sudo apt-get install -y --no-install-recommends git python3 python3-requests python3-gnupg s3cmd
|
||||
- run: |
|
||||
for deb in *.deb; do
|
||||
@@ -45,7 +45,7 @@ jobs:
|
||||
- run: sudo apt-get update -q
|
||||
- run: sudo apt-get install -y qemu-user-static
|
||||
- run: ./mk OONI_PSIPHON_TAGS="" DEBIAN_TILDE_VERSION=$GITHUB_RUN_NUMBER ./debian/arm
|
||||
- run: ./smoketest.sh ./CLI/linux/arm/ooniprobe
|
||||
- run: ./E2E/ooniprobe.sh ./CLI/linux/arm/ooniprobe
|
||||
- run: sudo apt-get install -y --no-install-recommends git python3 python3-requests python3-gnupg s3cmd
|
||||
- run: |
|
||||
for deb in *.deb; do
|
||||
@@ -64,7 +64,7 @@ jobs:
|
||||
- run: sudo apt-get update -q
|
||||
- run: sudo apt-get install -y qemu-user-static
|
||||
- run: ./mk OONI_PSIPHON_TAGS="" DEBIAN_TILDE_VERSION=$GITHUB_RUN_NUMBER ./debian/arm64
|
||||
- run: ./smoketest.sh ./CLI/linux/arm64/ooniprobe
|
||||
- run: ./E2E/ooniprobe.sh ./CLI/linux/arm64/ooniprobe
|
||||
- run: sudo apt-get install -y --no-install-recommends git python3 python3-requests python3-gnupg s3cmd
|
||||
- run: |
|
||||
for deb in *.deb; do
|
||||
|
||||
@@ -13,4 +13,4 @@ jobs:
|
||||
go-version: "1.16.4"
|
||||
- uses: actions/checkout@v2
|
||||
- run: ./mk OONI_PSIPHON_TAGS="" ./CLI/darwin/amd64/ooniprobe
|
||||
- run: ./smoketest.sh ./CLI/darwin/amd64/ooniprobe
|
||||
- run: ./E2E/ooniprobe.sh ./CLI/darwin/amd64/ooniprobe
|
||||
|
||||
@@ -16,7 +16,7 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
- run: ./mk OONI_PSIPHON_TAGS="" ./CLI/miniooni
|
||||
|
||||
- run: ./CLI/linux/amd64/miniooni --yes -nNi https://example.com web_connectivity
|
||||
- run: ./E2E/miniooni.bash ./CLI/linux/amd64/miniooni
|
||||
|
||||
- uses: actions/upload-artifact@v1
|
||||
with:
|
||||
|
||||
@@ -26,4 +26,4 @@ jobs:
|
||||
- uses: actions/download-artifact@v2
|
||||
with:
|
||||
name: ooniprobe.exe
|
||||
- run: bash.exe ./smoketest.sh ./ooniprobe.exe
|
||||
- run: bash.exe ./E2E/ooniprobe.sh ./ooniprobe.exe
|
||||
|
||||
Reference in New Issue
Block a user