[skywalking] branch docker/ext updated (85d4338 -> da2ef72)

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a change to branch docker/ext
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


 discard 85d4338  Add container checker
     new da2ef72  Add container checker

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (85d4338)
            \
             N -- N -- N   refs/heads/docker/ext (da2ef72)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/docker-ci.yaml | 9 +++++++--
 test/scripts/env.sh              | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100755 test/scripts/env.sh

[skywalking] 01/01: Add container checker

[ha...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hanahmily pushed a commit to branch docker/ext
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit da2ef721da1e8cb40fb0c33c2bca62a718e57969
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Fri Nov 22 21:24:17 2019 +0800

    Add container checker
---
 .github/workflows/docker-ci.yaml | 37 ++++++++++++++++++++++++++++++++++---
 test/scripts/env.sh              |  5 +++++
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml
index 23d5dc1..15257b6 100644
--- a/.github/workflows/docker-ci.yaml
+++ b/.github/workflows/docker-ci.yaml
@@ -18,14 +18,45 @@ name: docker-ci
 
 on: [push]
 env:
-  SCRIPTS_DIR: ./test/scripts
+  SKIP_TEST: true
+  DOCKER_DIR: ./docker
   LOG_DIR: /tmp/skywalking
 jobs:
   build:
     runs-on: ubuntu-16.04
     steps:
       - uses: actions/checkout@v1
+      - uses: actions/cache@v1
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
       - name: Build docker image
         run: make docker
-      - name: Start oap
-        run: docker run --name oap skywalking/oap
+      - name: Bootstrap cluster
+        run: cd ${DOCKER_DIR} && docker-compose up -d
+      - name: Check port avaliable
+        run: |
+          source ./test/scripts/env.sh
+          echo "Waiting for OAP ready"
+          export PORT=11800
+          check_port()
+          echo "OAP is ready"
+          echo "Waiting for UI ready"
+          PORT=8080
+          check_port()
+          echo "UI is ready"
+      - name: Collect logs
+        run: |
+          mkdir -p ${LOG_DIR}
+          cd ${DOCKER_DIR}
+          docker-compose logs oap > ${LOG_DIR}/oap.txt
+          docker-compose logs ui > ${LOG_DIR}/ui.txt
+          docker-compose logs elasticsearch > ${LOG_DIR}/es.txt
+        continue-on-error: true
+      - uses: actions/upload-artifact@v1.0.0
+        continue-on-error: true
+        with:
+          name: logs
+          path: /tmp/skywalking
diff --git a/test/scripts/env.sh b/test/scripts/env.sh
new file mode 100755
index 0000000..0257efd
--- /dev/null
+++ b/test/scripts/env.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+function check_port() {
+    for i in $(seq 1 15); do nc -zv -w 3 localhost ${PORT} && return || sleep 3; done; exit 1
+}
\ No newline at end of file