You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2020/09/14 10:23:28 UTC

[GitHub] [apisix] EnableAsync opened a new pull request #2225: move etcd cluster in docker for CI

EnableAsync opened a new pull request #2225:
URL: https://github.com/apache/apisix/pull/2225


   ### What this PR does / why we need it:
   <!--- Why is this change required? What problem does it solve? -->
   <!--- If it fixes an open issue, please link to the issue here. -->
   #2125
   move etcd cluster in docker for CI
   
   ### Pre-submission checklist:
   
   * [x] Did you explain what problem does this PR solve? Or what new features have been added?
   * [ ] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [x] Is this PR backward compatible?
   


----------------------------------------------------------------
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

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

Posted by 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

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

Posted by GitBox <gi...@apache.org>.

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



##########
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:
       should i change to `linux-install-etcd-client.sh` ?




----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

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



##########
File path: .github/workflows/build.yml
##########
@@ -28,9 +28,13 @@ jobs:
 
 #----------------------------------------------------------------------------
       - name: Linux Get dependencies
-        if: matrix.platform == 'ubuntu-18.04'
+        if: matrix.platform == 'ubuntu-18.04' && matrix.os_name != 'linux_openresty' && matrix.os_name != 'linux_tengine'
         run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl etcd
 
+      - name: Linux Get dependencies
+        if: matrix.platform == 'ubuntu-18.04' && (matrix.os_name == 'linux_openresty' || matrix.os_name == 'linux_tengine')
+        run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl etcd-client

Review comment:
       This test example uses the command `etcdctl`.
   https://github.com/apache/apisix/blob/master/t/core/etcd-auth.t#L29




----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

EnableAsync commented on pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#issuecomment-715903528


   > @EnableAsync any update?
   
   updated 😀


----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

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



##########
File path: .github/workflows/build.yml
##########
@@ -28,9 +28,13 @@ jobs:
 
 #----------------------------------------------------------------------------
       - name: Linux Get dependencies
-        if: matrix.platform == 'ubuntu-18.04'
+        if: matrix.platform == 'ubuntu-18.04' && matrix.os_name != 'linux_openresty' && matrix.os_name != 'linux_tengine'
         run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl etcd

Review comment:
       we should remove `etcd` from `apt install`




----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

nic-chen commented on a change in pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#discussion_r511530183



##########
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

Review comment:
       OK




----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

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



##########
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

Review comment:
       https://github.com/apache/apisix/blob/master/t/core/etcd-auth.t#L29
   
   in test case, need it.




----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

moonming commented on pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#issuecomment-718020382


   @EnableAsync nice work 👍


----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

moonming commented on pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#issuecomment-692752316


   Cool, agreed
   
   nic-chen <no...@github.com>于2020年9月15日 周二下午9:34写道：
   
   >
   >
   > I think we could run ETCD as a service in github actions. doc about
   > github actions services
   > <https://docs.github.com/en/actions/configuring-and-managing-workflows/about-service-containers>
   >
   >
   >
   >
   > —
   > You are receiving this because you commented.
   > Reply to this email directly, view it on GitHub
   > <https://github.com/apache/apisix/pull/2225#issuecomment-692717762>, or
   > unsubscribe
   > <https://github.com/notifications/unsubscribe-auth/AGJZBK5EZXAVWYOAIBOORJTSF5UMVANCNFSM4RLNQS4Q>
   > .
   >
   >
   > --
   Thanks,
   Ming Wen
   Twitter: _WenMing
   


----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

moonming commented on pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#issuecomment-693154696


   got it
   
   Thanks,
   Ming Wen
   Twitter: _WenMing
   
   
   EnableAsync <no...@github.com> 于2020年9月16日周三 上午11:40写道：
   
   > *@EnableAsync* commented on this pull request.
   > ------------------------------
   >
   > In .github/workflows/build.yml
   > <https://github.com/apache/apisix/pull/2225#discussion_r489142349>:
   >
   > >          run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl etcd
   >
   > +      - name: Linux Get dependencies
   > +        if: matrix.platform == 'ubuntu-18.04' && (matrix.os_name == 'linux_openresty' || matrix.os_name == 'linux_tengine')
   > +        run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl etcd-client
   >
   > This test example uses the command etcdctl.
   > https://github.com/apache/apisix/blob/master/t/core/etcd-auth.t#L29
   >
   > —
   > You are receiving this because you commented.
   > Reply to this email directly, view it on GitHub
   > <https://github.com/apache/apisix/pull/2225#discussion_r489142349>, or
   > unsubscribe
   > <https://github.com/notifications/unsubscribe-auth/AGJZBKYFEX6F4H75LTNZAA3SGAXRPANCNFSM4RLNQS4Q>
   > .
   >
   


----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

EnableAsync commented on pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#issuecomment-693182195


   > I think we could run ETCD as a service in github actions. [doc about github actions services](https://docs.github.com/en/actions/configuring-and-managing-workflows/about-service-containers)
   
   
   We cannot give a command for the container (CMD) to docker when a given service is created.
   https://github.community/t/how-do-i-properly-override-a-service-entrypoint/17435/4
   
   And I've only come up with the same solution as this one so far, any other solutions?
   https://github.community/t/job-service-command/16477


----------------------------------------------------------------
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

[GitHub] [apisix] moonming merged pull request #2225: move etcd cluster in docker for CI

Posted by GitBox <gi...@apache.org>.

moonming merged pull request #2225:
URL: https://github.com/apache/apisix/pull/2225


   


----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

moonming commented on pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#issuecomment-713267619


   @EnableAsync any update?


----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

nic-chen commented on a change in pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#discussion_r511526564



##########
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

Review comment:
       I think we don't need etcd client.




----------------------------------------------------------------
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

[GitHub] [apisix] nic-chen commented on pull request #2225: move etcd cluster in docker for CI

Posted by GitBox <gi...@apache.org>.

nic-chen commented on pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#issuecomment-692717762


   I think we could run ETCD as a service in github actions. [doc about github actions services](https://docs.github.com/en/actions/configuring-and-managing-workflows/about-service-containers)


----------------------------------------------------------------
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

[GitHub] [apisix] nic-chen commented on pull request #2225: move etcd cluster in docker for CI

Posted by GitBox <gi...@apache.org>.

nic-chen commented on pull request #2225:
URL: https://github.com/apache/apisix/pull/2225#issuecomment-701130087


   ping @EnableAsync 


----------------------------------------------------------------
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

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

Posted by GitBox <gi...@apache.org>.

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



##########
File path: .github/workflows/build.yml
##########
@@ -28,9 +28,13 @@ jobs:
 
 #----------------------------------------------------------------------------
       - name: Linux Get dependencies
-        if: matrix.platform == 'ubuntu-18.04'
+        if: matrix.platform == 'ubuntu-18.04' && matrix.os_name != 'linux_openresty' && matrix.os_name != 'linux_tengine'
         run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl etcd
 
+      - name: Linux Get dependencies
+        if: matrix.platform == 'ubuntu-18.04' && (matrix.os_name == 'linux_openresty' || matrix.os_name == 'linux_tengine')
+        run: sudo apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl etcd-client

Review comment:
       I don't think we need to install `etcd-client`




----------------------------------------------------------------
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