diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2357e26a1fe3c102c7e460df50f451ce6dbc03d7..1b0b443fd9346e215b7e0642ffe974e7933a5227 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,8 @@ jobs: matrix: operating-system: [ubuntu-latest] php-version: ['7.0', '7.1', '7.2', '7.3', '7.4'] - name: PHP ${{ matrix.php-version }} Test on ${{ matrix.operating-system }} + skywalking-version: ['8.1.0-es6', '8.0.1-es6', '8.0.0-es6'] + name: PHP ${{ matrix.php-version }} SkyWalking ${{ matrix.skywalking-version }} Test on ${{ matrix.operating-system }} steps: - name: Checkout uses: actions/checkout@v2 @@ -47,6 +48,7 @@ jobs: - name: Start docker-compose run: | + sudo sed -i "s/VERSION/${{ matrix.skywalking-version }}/g" e2e/docker-compose.yml docker-compose -f e2e/docker-compose.yml up -d docker ps @@ -89,7 +91,6 @@ jobs: composer install php e2e.php sudo cat /tmp/skywalking-php.log - docker logs e2e_skywalking_1 publish: needs: [build] diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml index 5d35437b97ff7e189684bac8d24fad18d8f08fce..495748300dc52e8f235b0b62f9dc20579143873b 100644 --- a/e2e/docker-compose.yml +++ b/e2e/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: skywalking: - image: apache/skywalking-oap-server + image: apache/skywalking-oap-server:VERSION ports: - "11800:11800" - "12800:12800" diff --git a/e2e/e2e.php b/e2e/e2e.php index 1bdbe7c93896bdf9bb17f8e6841302a0a2a7b734..ddc523953d4ffee78573015ea7abb03d7dfbbe0e 100644 --- a/e2e/e2e.php +++ b/e2e/e2e.php @@ -64,8 +64,11 @@ GRAPHQL; } public function call() { - $ch = curl_init('http://127.0.0.1:8080/call'); + $ch = curl_init('http://127.0.0.1:8083/call'); curl_exec($ch); + if (curl_getinfo($ch, CURLINFO_HTTP_CODE) != 200) { + exit(2); + } } public function verifyServices() { @@ -161,7 +164,7 @@ foreach($check as $func) { if (!$status) { $e2e->info("test $func fail..."); - exit(0); + exit(2); } $e2e->info("test $func success..."); diff --git a/e2e/nginx.conf b/e2e/nginx.conf index 2cd78af69eb8571429485c435830612478feb623..d17a9fd3582ff360cb87586bdcd2233bc8d966b0 100644 --- a/e2e/nginx.conf +++ b/e2e/nginx.conf @@ -14,7 +14,7 @@ # limitations under the License. server { - listen 8080; + listen 8083; root /var/www/html; index index.php;