From a8673956a5d6687e532a67ef0e09b0af1b786e01 Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Mon, 7 Jun 2021 20:12:12 +0700 Subject: [PATCH 1/4] add interdomain tests running on ci Signed-off-by: Denis Tingaikin --- .cloudtest.yaml | 22 +- .github/workflows/ci.yaml | 1 + .../update-dependent-repositories-gomod.yaml | 82 ------- LICENSE copy | 201 ------------------ README copy.md | 7 - entry_point_test.go | 9 +- go.mod | 2 +- go.sum | 11 +- 8 files changed, 27 insertions(+), 308 deletions(-) delete mode 100644 .github/workflows/update-dependent-repositories-gomod.yaml delete mode 100644 LICENSE copy delete mode 100644 README copy.md diff --git a/.cloudtest.yaml b/.cloudtest.yaml index 6df21a1..d0d3857 100644 --- a/.cloudtest.yaml +++ b/.cloudtest.yaml @@ -1,43 +1,43 @@ --- version: 1.0 root: "./.results" -timeout: 600 +timeout: 7200 shuffle-enabled: true statistics: enabled: true - interval: 30 + interval: 60 providers: - name: "kind-1" kind: "shell" instances: 1 - node-count: 3 + node-count: 2 retry: 1 enabled: true - timeout: 300 + timeout: 3600 env: - KIND_CLUSTER_NAME=cloudtest-kind-$(rands10) scripts: start: | kind create cluster --name ${KIND_CLUSTER_NAME} --config cluster-config.yaml --wait 120s config: | - sh -c "kind get kubeconfig --name ${KIND_CLUSTER_NAME} > \"${KIND_CLUSTER_NAME}-kubeconfig\" && echo \"${KIND_CLUSTER_NAME}-kubeconfig\"" + sh -c "kind get kubeconfig --name ${KIND_CLUSTER_NAME} > \"${HOME}/${KIND_CLUSTER_NAME}-kubeconfig\" && echo \"${HOME}/${KIND_CLUSTER_NAME}-kubeconfig\"" stop: | kind delete cluster --name ${KIND_CLUSTER_NAME} - name: "kind-2" kind: "shell" instances: 1 - node-count: 3 + node-count: 2 retry: 1 enabled: true - timeout: 300 + timeout: 3600 env: - KIND_CLUSTER_NAME=cloudtest-kind-$(rands10) scripts: start: | kind create cluster --name ${KIND_CLUSTER_NAME} --config cluster-config.yaml --wait 120s config: | - sh -c "kind get kubeconfig --name ${KIND_CLUSTER_NAME} > \"${KIND_CLUSTER_NAME}-kubeconfig\" && echo \"${KIND_CLUSTER_NAME}-kubeconfig\"" + sh -c "kind get kubeconfig --name ${KIND_CLUSTER_NAME} > \"${HOME}/${KIND_CLUSTER_NAME}-kubeconfig\" && echo \"${HOME}/${KIND_CLUSTER_NAME}-kubeconfig\"" stop: | kind delete cluster --name ${KIND_CLUSTER_NAME} reporting: @@ -50,11 +50,11 @@ executions: source: tags: - interdomain - timeout: 60 + timeout: 3600 cluster-count: 2 cluster-selector: - kind-1 - kind-2 cluster-env: - - KUBECONFIG_CLUSTER_1 - - KUBECONFIG_CLUSTER_2 \ No newline at end of file + - KUBECONFIG1 + - KUBECONFIG2 \ No newline at end of file diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7958944..58359fc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -65,6 +65,7 @@ jobs: git diff --name-only --exit-code go.sum || ( echo "Run go tidy" && false ) cloudtest: runs-on: ubuntu-latest + steps: - uses: actions/checkout@v2 - uses: actions/setup-go@v1 with: diff --git a/.github/workflows/update-dependent-repositories-gomod.yaml b/.github/workflows/update-dependent-repositories-gomod.yaml deleted file mode 100644 index a7a0b10..0000000 --- a/.github/workflows/update-dependent-repositories-gomod.yaml +++ /dev/null @@ -1,82 +0,0 @@ ---- -name: Update dependent repositories -on: - push: - branches: - - main - workflow_run: - types: - - completed - workflows: - - 'automerge' -jobs: - update-dependent-repositories: - continue-on-error: true - strategy: - fail-fast: false - matrix: - repository: - - integration-k8s-packet - - integration-k8s-gke - name: Update ${{ matrix.repository }} - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' && github.actor == 'nsmbot' || github.ref == 'refs/heads/main' }} - steps: - - name: Print environment with masked secrets - run: printenv - - name: Checkout ${{ github.repository }} - uses: actions/checkout@v2 - with: - path: ${{ github.repository }} - repository: ${{ github.repository }} - token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} - - name: Find merged PR - uses: jwalton/gh-find-current-pr@v1 - id: findPr - with: - github-token: ${{ github.token }} - - name: Create commit message - working-directory: ${{ github.repository }} - run: | - echo "Update go.mod and go.sum to latest version from ${{ github.repository }}@main ${{ github.repository }}#${{ steps.findPr.outputs.pr }}" >> /tmp/commit-message - echo "" >> /tmp/commit-message - echo "${{ github.repository }} PR link: https://github.com/${{ github.repository }}/pull/${{ steps.findPr.outputs.pr }}" >> /tmp/commit-message - echo "" >> /tmp/commit-message - echo "${{ github.repository }} commit message:" >> /tmp/commit-message - git log -1 >> /tmp/commit-message - echo "Commit Message:" - cat /tmp/commit-message - - uses: actions/setup-go@v1 - with: - go-version: 1.15 - - name: Get current integration-tests version - id: get-integration-tests-version - working-directory: ${{ github.repository }} - run: | - echo "::set-output name=value::$(go list -m -f '{{ .Version }}' github.com/networkservicemesh/integration-tests)" - - name: Checkout networkservicemesh/${{ matrix.repository }} - uses: actions/checkout@v2 - with: - path: networkservicemesh/${{ matrix.repository }} - repository: networkservicemesh/${{ matrix.repository }} - token: ${{ secrets.NSM_BOT_GITHUB_TOKEN }} - - name: Update networkservicemesh/${{ matrix.repository }} locally - working-directory: networkservicemesh/${{ matrix.repository }} - run: | - GOPRIVATE=github.com/networkservicemesh go get github.com/networkservicemesh/integration-tests@${{ steps.get-integration-tests-version.outputs.value }} - go mod tidy - git diff - - name: Push update to the ${{ matrix.repository }} - working-directory: networkservicemesh/${{ matrix.repository }} - run: | - echo Starting to update repositotry ${{ matrix.repository }} - git config --global user.email "nsmbot@networkservicmesh.io" - git config --global user.name "NSMBot" - git add go.mod go.sum - if ! [ -n "$(git diff --cached --exit-code)" ]; then - echo ${{ matrix.repository }} is up to date - exit 0; - fi - git commit -s -F /tmp/commit-message - git checkout -b update/${{ github.repository }} - git push -f origin update/${{ github.repository }} diff --git a/LICENSE copy b/LICENSE copy deleted file mode 100644 index 261eeb9..0000000 --- a/LICENSE copy +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed 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. diff --git a/README copy.md b/README copy.md deleted file mode 100644 index fa82f54..0000000 --- a/README copy.md +++ /dev/null @@ -1,7 +0,0 @@ -# integration-k8s-kind - -How to run integration tests locally? -```bash -kind create cluster --config cluster-config.yaml --wait 120s -go test ./... -``` diff --git a/entry_point_test.go b/entry_point_test.go index 2df75de..0b67d3f 100644 --- a/entry_point_test.go +++ b/entry_point_test.go @@ -14,10 +14,17 @@ // See the License for the specific language governing permissions and // limitations under the License. +// +build interdomain + package test import ( "testing" + + "github.com/networkservicemesh/integration-tests/suites/interdomain/basic" + "github.com/stretchr/testify/suite" ) -func TestEmpty(t *testing.T) {} +func TestInterdomainBasicSuite(t *testing.T) { + suite.Run(t, new(basic.Suite)) +} diff --git a/go.mod b/go.mod index 0b57f8e..f57a966 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/networkservicemesh/integration-k8s-kind go 1.16 require ( - github.com/networkservicemesh/integration-tests v0.0.0-20210429125029-18b897be11bb + github.com/networkservicemesh/integration-tests v0.0.0-20210606135158-4bb6710fd413 github.com/stretchr/testify v1.7.0 ) diff --git a/go.sum b/go.sum index 2717fd4..716e84b 100644 --- a/go.sum +++ b/go.sum @@ -154,10 +154,10 @@ github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/networkservicemesh/gotestmd v0.0.0-20210326113820-7c7fa1e058ed h1:bZqJ1P8Gw7rxVF5ehlqnfTz9ygaRkyBBR4M5slVUw2Q= -github.com/networkservicemesh/gotestmd v0.0.0-20210326113820-7c7fa1e058ed/go.mod h1:RsxZNZRDhTSkY21gzrJVC4ufT10bfeHRvrRTtypUx+k= -github.com/networkservicemesh/integration-tests v0.0.0-20210429125029-18b897be11bb h1:eHZMjl53qXKVtrcth49TJtAF3Uk74B8UFOA9au/6OZs= -github.com/networkservicemesh/integration-tests v0.0.0-20210429125029-18b897be11bb/go.mod h1:Df3NLNCMmJ2VFheKPQBvRGpG0htDHB/ymGgOflmlG74= +github.com/networkservicemesh/gotestmd v0.0.0-20210505083953-36a9ba90c9c6 h1:5Jh5uQYZ/2GHu3ACx0V7lLrriHo2WiyS8V7OM5JLxfw= +github.com/networkservicemesh/gotestmd v0.0.0-20210505083953-36a9ba90c9c6/go.mod h1:enMZGxL7B1TtqRHx94CiL6JuYIz9/GwBe0DqjL3l3xw= +github.com/networkservicemesh/integration-tests v0.0.0-20210606135158-4bb6710fd413 h1:3RMao1yIqd9vHVBgpfeGPmhubT5q7tBQbvIx35OQmNA= +github.com/networkservicemesh/integration-tests v0.0.0-20210606135158-4bb6710fd413/go.mod h1:hiF3iJavLCo5B1pYPO8mm9IGE8TUv832Lu1sM7s3WGc= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -284,8 +284,9 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 h1:cdsMqa2nXzqlgs183pHxtvoVwU7CyzaCTAUOg94af4c= +golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= From 634343f5e4d47052b9ad8b6c97f69074de9c5d6a Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Mon, 7 Jun 2021 20:27:09 +0700 Subject: [PATCH 2/4] fix ci issues Signed-off-by: Denis Tingaikin --- .cloudtest.yaml | 2 +- .github/workflows/ci.yaml | 6 ++++-- entry_point_test.go | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cloudtest.yaml b/.cloudtest.yaml index d0d3857..13524a4 100644 --- a/.cloudtest.yaml +++ b/.cloudtest.yaml @@ -57,4 +57,4 @@ executions: - kind-2 cluster-env: - KUBECONFIG1 - - KUBECONFIG2 \ No newline at end of file + - KUBECONFIG2 diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 58359fc..3fd08f2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,6 +39,7 @@ jobs: uses: golangci/golangci-lint-action@v2 with: version: v1.35 + build-tags: interdomain excludeFmtErrorf: name: exclude fmt.Errorf runs-on: ubuntu-latest @@ -73,8 +74,9 @@ jobs: github-token: ${{ github.token }} - name: setup env run: | - echo "::set-env name=GOPATH::$(dirname $GITHUB_WORKSPACE)" - echo "::add-path::$(dirname $GITHUB_WORKSPACE)/bin" + echo GOPATH=$GITHUB_WORKSPACE >> $GITHUB_ENV + echo GO111MODULE=on >> $GITHUB_ENV + echo $GITHUB_WORKSPACE/bin >> $GITHUB_PATH - name: Get cloudtest run: go get github.com/networkservicemesh/cloudtest@master - name: Get kind diff --git a/entry_point_test.go b/entry_point_test.go index 0b67d3f..55b88c7 100644 --- a/entry_point_test.go +++ b/entry_point_test.go @@ -21,8 +21,9 @@ package test import ( "testing" - "github.com/networkservicemesh/integration-tests/suites/interdomain/basic" "github.com/stretchr/testify/suite" + + "github.com/networkservicemesh/integration-tests/suites/interdomain/basic" ) func TestInterdomainBasicSuite(t *testing.T) { From cabe9703659f0dff874d0c948a58c01be419e63c Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Mon, 7 Jun 2021 20:32:49 +0700 Subject: [PATCH 3/4] fix ci issues Signed-off-by: Denis Tingaikin --- .github/workflows/ci.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3fd08f2..8a1daba 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -39,7 +39,7 @@ jobs: uses: golangci/golangci-lint-action@v2 with: version: v1.35 - build-tags: interdomain + args: --build-tags=interdomain excludeFmtErrorf: name: exclude fmt.Errorf runs-on: ubuntu-latest @@ -67,7 +67,6 @@ jobs: cloudtest: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - uses: actions/setup-go@v1 with: go-version: 1.16 @@ -81,9 +80,14 @@ jobs: run: go get github.com/networkservicemesh/cloudtest@master - name: Get kind run: go get sigs.k8s.io/kind@v0.11.0 + - name: Check out code + uses: actions/checkout@v2 + with: + path: ${{ github.workspace }}/src/github.com/${{ github.repository }} - name: Run interdomain testing run: | cloudtest + working-directory: ${{ github.workspace }}/src/github.com/${{ github.repository }} - name: Upload artifacts if: ${{ success() || failure() || cancelled() }} uses: actions/upload-artifact@v2 From 5e0f5430f7ce5a8094a0e11dec27fead06d9a550 Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Mon, 7 Jun 2021 22:44:35 +0700 Subject: [PATCH 4/4] update integration-tests Signed-off-by: Denis Tingaikin --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index f57a966..0718872 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,6 @@ module github.com/networkservicemesh/integration-k8s-kind go 1.16 require ( - github.com/networkservicemesh/integration-tests v0.0.0-20210606135158-4bb6710fd413 + github.com/networkservicemesh/integration-tests v0.0.0-20210607153731-d3cd5eee851d github.com/stretchr/testify v1.7.0 ) diff --git a/go.sum b/go.sum index 716e84b..5c7730f 100644 --- a/go.sum +++ b/go.sum @@ -156,8 +156,8 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/networkservicemesh/gotestmd v0.0.0-20210505083953-36a9ba90c9c6 h1:5Jh5uQYZ/2GHu3ACx0V7lLrriHo2WiyS8V7OM5JLxfw= github.com/networkservicemesh/gotestmd v0.0.0-20210505083953-36a9ba90c9c6/go.mod h1:enMZGxL7B1TtqRHx94CiL6JuYIz9/GwBe0DqjL3l3xw= -github.com/networkservicemesh/integration-tests v0.0.0-20210606135158-4bb6710fd413 h1:3RMao1yIqd9vHVBgpfeGPmhubT5q7tBQbvIx35OQmNA= -github.com/networkservicemesh/integration-tests v0.0.0-20210606135158-4bb6710fd413/go.mod h1:hiF3iJavLCo5B1pYPO8mm9IGE8TUv832Lu1sM7s3WGc= +github.com/networkservicemesh/integration-tests v0.0.0-20210607153731-d3cd5eee851d h1:m0nGvrhk5Obfupq1DP2/u1Ps3QnAX/hQw7v58379lEc= +github.com/networkservicemesh/integration-tests v0.0.0-20210607153731-d3cd5eee851d/go.mod h1:hiF3iJavLCo5B1pYPO8mm9IGE8TUv832Lu1sM7s3WGc= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=