[GitHub] [apisix] membphis commented on a change in pull request #2225: move etcd cluster in docker for CI

[GitBox <gi...@apache.org>]

membphis commented on a change in pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#discussion_r511525886



##########
File path: .github/workflows/build.yml
##########
@@ -13,52 +13,41 @@ jobs:
       matrix:
         platform: [ubuntu-18.04]
         os_name: [linux_openresty, linux_tengine, linux_apisix_master_luarocks, linux_apisix_current_luarocks, linux_openresty_mtls]
-        include:
-          - platform: macos-latest
-            os_name: osx_openresty
 
     runs-on: ${{ matrix.platform }}
     env:
       SERVER_NAME: ${{ matrix.os_name }}
 
 
+    services:
+      etcd:
+        image: bitnami/etcd:3.4.0
+        ports: 
+          - 2379:2379
+          - 2380:2380
+        env: 
+          ALLOW_NONE_AUTHENTICATION: yes
+          ETCD_ADVERTISE_CLIENT_URLS: http://0.0.0.0:2379
+

Review comment:
       two blank lines are enough

##########
File path: .travis/linux_apisix_current_luarocks_runner.sh
##########
@@ -40,19 +40,20 @@ do_install() {
     cd ..
     rm -rf luarocks-2.4.4
 
-    ./utils/install-etcd.sh
+    # ./utils/install-etcd.sh
+    ./utils/install-etcd-client.sh
 }
 
 script() {
     export_or_prefix
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
     openresty -V
-    sudo service etcd start
-    sudo service etcd stop
-    mkdir -p ~/etcd-data
-    etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
-    etcdctl version
-    sleep 5
+    # sudo service etcd start

Review comment:
       if we do not need them, we should remove them.

##########
File path: .travis/linux_apisix_current_luarocks_runner.sh
##########
@@ -40,19 +40,20 @@ do_install() {
     cd ..
     rm -rf luarocks-2.4.4
 
-    ./utils/install-etcd.sh
+    # ./utils/install-etcd.sh
+    ./utils/install-etcd-client.sh
 }
 
 script() {
     export_or_prefix
     export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$OPENRESTY_PREFIX/bin:$PATH
     openresty -V
-    sudo service etcd start
-    sudo service etcd stop
-    mkdir -p ~/etcd-data
-    etcd --listen-client-urls 'http://0.0.0.0:2379' --advertise-client-urls='http://0.0.0.0:2379' --data-dir ~/etcd-data > /dev/null 2>&1 &
-    etcdctl version
-    sleep 5
+    # sudo service etcd start

Review comment:
       please fix other similar points.

##########
File path: .travis/linux_openresty_mtls_runner.sh
##########
@@ -59,7 +59,8 @@ do_install() {
 
     sudo luarocks install luacheck > build.log 2>&1 || (cat build.log && exit 1)
 
-    ./utils/install-etcd.sh
+    # ./utils/install-etcd.sh

Review comment:
       need to remove too

##########
File path: utils/install-etcd-client.sh
##########
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+wget https://github.com/etcd-io/etcd/releases/download/v3.4.0/etcd-v3.4.0-linux-amd64.tar.gz

Review comment:
       `linux` should be added to the file name




----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org