From 650a59e0cc5c96e4b4a485eadb25d358f86ee5d3 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Fri, 31 May 2024 14:42:08 +0200 Subject: [PATCH 01/61] added github actions --- .github/workflows/otc-golangci-lint.yaml | 34 ++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/otc-golangci-lint.yaml diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml new file mode 100644 index 000000000..16b53c600 --- /dev/null +++ b/.github/workflows/otc-golangci-lint.yaml @@ -0,0 +1,34 @@ +name: Run golangci-lint + +on: + pull_request: + types: + - opened + - closed + - edited + - reopened + - synchronize + +jobs: + lint: + name: golangci-lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: 1.20 + - name: golangci-lint + uses: golangci/golangci-lint-action@v6 + with: + version: v1.53.3 + vet: + name: check vet + runs-on: ubuntu-jammy + steps: + - run: make vet + unit_tests: + name: run unit tests + runs-on: ubuntu-jammy + steps: + - run: make test From 49189629502740fa85add2d25dd0486affe5efa8 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Fri, 31 May 2024 14:55:38 +0200 Subject: [PATCH 02/61] added github actions --- .github/workflows/otc-golangci-lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 16b53c600..542888c24 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: 1.20 + go-version: "1.20" - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: From aa0417ac9db3f001f0f9768bc3a9429e11572339 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Fri, 31 May 2024 15:06:05 +0200 Subject: [PATCH 03/61] check actions --- .github/workflows/otc-golangci-lint.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 542888c24..1bceae93c 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -26,9 +26,17 @@ jobs: name: check vet runs-on: ubuntu-jammy steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" - run: make vet unit_tests: name: run unit tests runs-on: ubuntu-jammy steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" - run: make test From 98b7a0cbe57ff10f35f1d29ad12cba7db3d83838 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Fri, 31 May 2024 15:08:52 +0200 Subject: [PATCH 04/61] fix image --- .github/workflows/otc-golangci-lint.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 1bceae93c..fa561c2c4 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -24,7 +24,7 @@ jobs: version: v1.53.3 vet: name: check vet - runs-on: ubuntu-jammy + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 @@ -33,7 +33,7 @@ jobs: - run: make vet unit_tests: name: run unit tests - runs-on: ubuntu-jammy + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 From de3c7a1df76c600eef99e17312c299c45ac55f75 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Fri, 31 May 2024 15:23:58 +0200 Subject: [PATCH 05/61] check func tests --- .github/workflows/functional-tests.yaml | 15 +++++++++++++++ .github/workflows/otc-golangci-lint.yaml | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/functional-tests.yaml diff --git a/.github/workflows/functional-tests.yaml b/.github/workflows/functional-tests.yaml new file mode 100644 index 000000000..3c8eb2b0f --- /dev/null +++ b/.github/workflows/functional-tests.yaml @@ -0,0 +1,15 @@ +on: + label: + types: + - post + +jobs: + acc_tests: + name: run go vet + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make acceptance diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index fa561c2c4..3bc1c0d7d 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -1,4 +1,4 @@ -name: Run golangci-lint +name: Check code quality on: pull_request: @@ -11,7 +11,7 @@ on: jobs: lint: - name: golangci-lint + name: run golangci-lint runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -23,7 +23,7 @@ jobs: with: version: v1.53.3 vet: - name: check vet + name: run go vet runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 From 58d8ccf3733b5c9c5cc08eed7fb576bffe35d5d3 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Fri, 31 May 2024 15:26:17 +0200 Subject: [PATCH 06/61] check func tests --- .github/workflows/functional-tests.yaml | 2 ++ .github/workflows/otc-golangci-lint.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/functional-tests.yaml b/.github/workflows/functional-tests.yaml index 3c8eb2b0f..1967111e2 100644 --- a/.github/workflows/functional-tests.yaml +++ b/.github/workflows/functional-tests.yaml @@ -1,3 +1,5 @@ +name: run acceptance tests + on: label: types: diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 3bc1c0d7d..9a2720e42 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -1,4 +1,4 @@ -name: Check code quality +name: check code quality on: pull_request: From 0076feaa78e4beb81220faa5120902368e43f463 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 11:47:46 +0200 Subject: [PATCH 07/61] change behaviour --- .github/workflows/functional-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/functional-tests.yaml b/.github/workflows/functional-tests.yaml index 1967111e2..60ea0994a 100644 --- a/.github/workflows/functional-tests.yaml +++ b/.github/workflows/functional-tests.yaml @@ -3,7 +3,7 @@ name: run acceptance tests on: label: types: - - post + - created jobs: acc_tests: From 6a1d792b0d78b2e2cfd593ff76b0deb64c94be25 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 11:52:25 +0200 Subject: [PATCH 08/61] change behaviour --- .github/workflows/functional-tests.yaml | 17 ----------------- .github/workflows/otc-golangci-lint.yaml | 10 ++++++++++ 2 files changed, 10 insertions(+), 17 deletions(-) delete mode 100644 .github/workflows/functional-tests.yaml diff --git a/.github/workflows/functional-tests.yaml b/.github/workflows/functional-tests.yaml deleted file mode 100644 index 60ea0994a..000000000 --- a/.github/workflows/functional-tests.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: run acceptance tests - -on: - label: - types: - - created - -jobs: - acc_tests: - name: run go vet - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make acceptance diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 9a2720e42..fa725cfdb 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -40,3 +40,13 @@ jobs: with: go-version: "1.20" - run: make test + acc_tests: + name: run acceptance tests + runs-on: ubuntu-22.04 + if: ${{ github.event.label.name == 'post' }} + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make acceptance From 7d20c097a27e2c19accdd5ad82ad9880572f3a92 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 11:56:01 +0200 Subject: [PATCH 09/61] change behaviour --- .github/workflows/otc-golangci-lint.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index fa725cfdb..102701ea7 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -8,6 +8,7 @@ on: - edited - reopened - synchronize + - labeled jobs: lint: From c16af2424c0caa96c9723344880950a79e83bc81 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 11:58:08 +0200 Subject: [PATCH 10/61] change behaviour --- .github/workflows/otc-golangci-lint.yaml | 11 ----------- .github/workflows/otc-run-acc-tests.yaml | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/otc-run-acc-tests.yaml diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 102701ea7..9a2720e42 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -8,7 +8,6 @@ on: - edited - reopened - synchronize - - labeled jobs: lint: @@ -41,13 +40,3 @@ jobs: with: go-version: "1.20" - run: make test - acc_tests: - name: run acceptance tests - runs-on: ubuntu-22.04 - if: ${{ github.event.label.name == 'post' }} - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make acceptance diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml new file mode 100644 index 000000000..b699d5749 --- /dev/null +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -0,0 +1,18 @@ +name: check code quality + +on: + label: + types: + - created + +jobs: + acc_tests: + name: run acceptance tests + runs-on: ubuntu-22.04 + if: ${{ github.event.label.name == 'post' }} + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make acceptance From 8beb5fc0a200b9f69016257ebaff0fc6da61588b Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 11:59:44 +0200 Subject: [PATCH 11/61] change behaviour --- .github/workflows/otc-run-acc-tests.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index b699d5749..d4e9cfd58 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -1,6 +1,9 @@ name: check code quality on: + pull_request: + types: + - opened label: types: - created From fe0276f09fa6e0c6a50474bb9897f17c17de0222 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 12:02:37 +0200 Subject: [PATCH 12/61] change behaviour --- .github/workflows/otc-golangci-lint.yaml | 10 +--------- .github/workflows/otc-run-acc-tests.yaml | 13 +++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 9a2720e42..9eb2087cc 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -31,12 +31,4 @@ jobs: with: go-version: "1.20" - run: make vet - unit_tests: - name: run unit tests - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make test + diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index d4e9cfd58..d33e6052e 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -4,11 +4,24 @@ on: pull_request: types: - opened + - closed + - edited + - reopened + - synchronize label: types: - created jobs: + unit_tests: + name: run unit tests + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make test acc_tests: name: run acceptance tests runs-on: ubuntu-22.04 From bc248320e7ab9ce97dd5f99f598cdf0ed152fd22 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 12:04:34 +0200 Subject: [PATCH 13/61] change behaviour --- .github/workflows/otc-golangci-lint.yaml | 10 +++++++++- .github/workflows/otc-run-acc-tests.yaml | 11 ++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 9eb2087cc..9a2720e42 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -31,4 +31,12 @@ jobs: with: go-version: "1.20" - run: make vet - + unit_tests: + name: run unit tests + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make test diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index d33e6052e..9e198cf8c 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -11,17 +11,10 @@ on: label: types: - created + - deleted + - edited jobs: - unit_tests: - name: run unit tests - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make test acc_tests: name: run acceptance tests runs-on: ubuntu-22.04 From 0e82330005d4d06155e1f87f5dd4440154b271ee Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 12:10:48 +0200 Subject: [PATCH 14/61] change behaviour --- .github/workflows/otc-run-acc-tests.yaml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index 9e198cf8c..27c975f31 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -3,16 +3,7 @@ name: check code quality on: pull_request: types: - - opened - - closed - - edited - - reopened - - synchronize - label: - types: - - created - - deleted - - edited + - labeled jobs: acc_tests: From 1a8b36bc9937363d3b1787280f4cdd6e7d5f01dd Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:31:42 +0200 Subject: [PATCH 15/61] add env variables --- .github/workflows/otc-run-acc-tests.yaml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index 27c975f31..ad6ce58b3 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -1,4 +1,4 @@ -name: check code quality +name: run tests on: pull_request: @@ -7,7 +7,7 @@ on: jobs: acc_tests: - name: run acceptance tests + name: acceptance tests runs-on: ubuntu-22.04 if: ${{ github.event.label.name == 'post' }} steps: @@ -16,3 +16,10 @@ jobs: with: go-version: "1.20" - run: make acceptance + env: + AUTH_URL: ${{ secrets.AUTH_URL }} + PASSWORD: ${{ secrets.PASSWORD }} + USERNAME: ${{ secrets.USERNAME }} + USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} + FUNCTEST_PROJECT_NAME: ${{ secrets.FUNCTEST_PROJECT_NAME }} + From 942f26e1a2a8f73b7d88390567ac8e141000490f Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:34:12 +0200 Subject: [PATCH 16/61] add env variables --- .github/workflows/otc-run-acc-tests.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index ad6ce58b3..1cdaff228 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -15,7 +15,8 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" - - run: make acceptance + - run: env +# - run: make acceptance env: AUTH_URL: ${{ secrets.AUTH_URL }} PASSWORD: ${{ secrets.PASSWORD }} From 56a9aaaa40bdb7b567735d3de59f86562cc7a1a4 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:40:08 +0200 Subject: [PATCH 17/61] add env variables --- .github/workflows/otc-run-acc-tests.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index 1cdaff228..40cb51b14 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -18,9 +18,9 @@ jobs: - run: env # - run: make acceptance env: - AUTH_URL: ${{ secrets.AUTH_URL }} - PASSWORD: ${{ secrets.PASSWORD }} - USERNAME: ${{ secrets.USERNAME }} - USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} - FUNCTEST_PROJECT_NAME: ${{ secrets.FUNCTEST_PROJECT_NAME }} + AUTH_URL: '${{ secrets.AUTH_URL }}' + PASSWORD: '${{ secrets.PASSWORD }}' + USERNAME: '${{ secrets.USERNAME }}' + USER_DOMAIN_NAME: '${{ secrets.USER_DOMAIN_NAME }}' + FUNCTEST_PROJECT_NAME: '${{ secrets.FUNCTEST_PROJECT_NAME }}' From 361e99374d290f2288e8366476dfdc005014d4ee Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:43:06 +0200 Subject: [PATCH 18/61] add env variables --- .github/workflows/otc-run-acc-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index 40cb51b14..4daaab2d0 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" - - run: env + - run: echo ${{secrets.AUTH_URL}} | sed 's/./& /g' # - run: make acceptance env: AUTH_URL: '${{ secrets.AUTH_URL }}' From 56670f8861e6fbddfcb27c2e3a7b6fec5024cec8 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:44:14 +0200 Subject: [PATCH 19/61] add env variables --- .github/workflows/otc-run-acc-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index 4daaab2d0..c827db8f1 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" - - run: echo ${{secrets.AUTH_URL}} | sed 's/./& /g' + - run: echo '${{secrets.AUTH_URL}}' | sed 's/./& /g' # - run: make acceptance env: AUTH_URL: '${{ secrets.AUTH_URL }}' From d0d98854f3b3352336f7d77f978dbebfed5dd7c0 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:45:58 +0200 Subject: [PATCH 20/61] add env variables --- .github/workflows/otc-run-acc-tests.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index c827db8f1..ba8e1892d 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -15,12 +15,12 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" - - run: echo '${{secrets.AUTH_URL}}' | sed 's/./& /g' + - run: echo ${{secrets.AUTH_URL}} | sed 's/./& /g' # - run: make acceptance env: - AUTH_URL: '${{ secrets.AUTH_URL }}' - PASSWORD: '${{ secrets.PASSWORD }}' - USERNAME: '${{ secrets.USERNAME }}' - USER_DOMAIN_NAME: '${{ secrets.USER_DOMAIN_NAME }}' - FUNCTEST_PROJECT_NAME: '${{ secrets.FUNCTEST_PROJECT_NAME }}' + AUTH_URL: ${{ secrets.AUTH_URL }} + PASSWORD: ${{ secrets.PASSWORD }} + USERNAME: ${{ secrets.USERNAME }} + USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} + FUNCTEST_PROJECT_NAME: ${{ secrets.FUNCTEST_PROJECT_NAME }} From 790cf4634db20700b5ffeb365287dbfa90ee51b0 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:48:09 +0200 Subject: [PATCH 21/61] add env variables --- .github/workflows/otc-run-acc-tests.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index ba8e1892d..f3eab280d 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -15,7 +15,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" - - run: echo ${{secrets.AUTH_URL}} | sed 's/./& /g' + - run: env && echo ${{secrets.AUTH_URL}} | sed 's/./& /g' && echo $AUTH_URL # - run: make acceptance env: AUTH_URL: ${{ secrets.AUTH_URL }} @@ -23,4 +23,3 @@ jobs: USERNAME: ${{ secrets.USERNAME }} USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} FUNCTEST_PROJECT_NAME: ${{ secrets.FUNCTEST_PROJECT_NAME }} - From bb856a5888dda159947192eb17b86731b10b258f Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:51:52 +0200 Subject: [PATCH 22/61] add env variables --- .github/workflows/secrets.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/secrets.yaml diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml new file mode 100644 index 000000000..1f415560c --- /dev/null +++ b/.github/workflows/secrets.yaml @@ -0,0 +1,22 @@ +name: Show Me the S3cr3tz +on: [push] + +jobs: + debug: + name: Debug + runs-on: ubuntu-latest + + steps: + - name: Check out code + uses: actions/checkout@v2 + + - name: Set up secret file + env: + AUTH_URL: ${{ secrets.AUTH_URL }} + USERNAME: ${{ secrets.USERNAME }} + run: | + echo AUTH_URL >> secrets.txt + echo USERNAME >> secrets.txt + + - name: Run tmate + uses: mxschmitt/action-tmate@v2 From 830731a3983381736ec21af488ab48a59ace39e7 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:55:44 +0200 Subject: [PATCH 23/61] add env variables --- .github/workflows/secrets.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 1f415560c..b3bd10935 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -15,8 +15,8 @@ jobs: AUTH_URL: ${{ secrets.AUTH_URL }} USERNAME: ${{ secrets.USERNAME }} run: | - echo AUTH_URL >> secrets.txt - echo USERNAME >> secrets.txt + echo $AUTH_URL >> secrets.txt + echo $USERNAME >> secrets.txt - name: Run tmate uses: mxschmitt/action-tmate@v2 From c1d1eac466eb74d784265b48e6d6e87019e1683c Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 13:59:29 +0200 Subject: [PATCH 24/61] add env variables --- .github/workflows/secrets.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index b3bd10935..84b41e91d 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -7,16 +7,11 @@ jobs: runs-on: ubuntu-latest steps: - - name: Check out code - uses: actions/checkout@v2 +# - name: Check out code +# uses: actions/checkout@v2 - name: Set up secret file env: AUTH_URL: ${{ secrets.AUTH_URL }} USERNAME: ${{ secrets.USERNAME }} - run: | - echo $AUTH_URL >> secrets.txt - echo $USERNAME >> secrets.txt - - - name: Run tmate - uses: mxschmitt/action-tmate@v2 + run: echo -n "${{ secrets.AUTH_URL }}" | xxd -ps From c14e64f3ebeac1feb3f6e82ea6a0fb9a675de185 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:01:19 +0200 Subject: [PATCH 25/61] add env variables --- .github/workflows/secrets.yaml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 84b41e91d..005859236 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -1,17 +1,17 @@ -name: Show Me the S3cr3tz -on: [push] +on: push jobs: - debug: - name: Debug + create-envfile: runs-on: ubuntu-latest - steps: -# - name: Check out code -# uses: actions/checkout@v2 - - - name: Set up secret file - env: - AUTH_URL: ${{ secrets.AUTH_URL }} - USERNAME: ${{ secrets.USERNAME }} - run: echo -n "${{ secrets.AUTH_URL }}" | xxd -ps + - name: Make envfile + uses: SpicyPizza/create-envfile@v2.0 + with: + envkey_SECRETS: ${{ toJSON(secrets) }} + file_name: .env + fail_on_empty: false + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: cats + path: . From 2f28f91b81e3c1fd1316bd3e0b9560f46e58c106 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:05:40 +0200 Subject: [PATCH 26/61] add env variables --- .github/workflows/otc-run-acc-tests.yaml | 2 +- .github/workflows/secrets.yaml | 27 ++++++++++++------------ 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index f3eab280d..4264cec6c 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -22,4 +22,4 @@ jobs: PASSWORD: ${{ secrets.PASSWORD }} USERNAME: ${{ secrets.USERNAME }} USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} - FUNCTEST_PROJECT_NAME: ${{ secrets.FUNCTEST_PROJECT_NAME }} + FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 005859236..241ae1bd3 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -1,17 +1,18 @@ -on: push +name: Show Me the S3cr3tz +on: [push] jobs: - create-envfile: + debug: + name: Debug runs-on: ubuntu-latest + steps: - - name: Make envfile - uses: SpicyPizza/create-envfile@v2.0 - with: - envkey_SECRETS: ${{ toJSON(secrets) }} - file_name: .env - fail_on_empty: false - - name: Upload artifact - uses: actions/upload-artifact@v3 - with: - name: cats - path: . +# - name: Check out code +# uses: actions/checkout@v2 + + - name: Set up secret file + env: + AUTH_URL: ${{ secrets.AUTH_URL }} + USERNAME: ${{ secrets.USERNAME }} + FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} + run: env && echo -n "${{ secrets.AUTH_URL }}" | xxd -ps From 38c65c1b9e232e49e2008d59f99fdc21c7a909f7 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:06:56 +0200 Subject: [PATCH 27/61] add env variables --- .github/workflows/secrets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 241ae1bd3..5fcccaa0a 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -14,5 +14,5 @@ jobs: env: AUTH_URL: ${{ secrets.AUTH_URL }} USERNAME: ${{ secrets.USERNAME }} - FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} + FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} run: env && echo -n "${{ secrets.AUTH_URL }}" | xxd -ps From fb8eb5e6780c723b621ff48ad14d4a8d617639eb Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:13:33 +0200 Subject: [PATCH 28/61] add env variables --- .github/workflows/secrets.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 5fcccaa0a..a5a821018 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -5,7 +5,7 @@ jobs: debug: name: Debug runs-on: ubuntu-latest - + environment: ${{ vars.ENVIRONMENT_STAGE }} steps: # - name: Check out code # uses: actions/checkout@v2 @@ -15,4 +15,4 @@ jobs: AUTH_URL: ${{ secrets.AUTH_URL }} USERNAME: ${{ secrets.USERNAME }} FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} - run: env && echo -n "${{ secrets.AUTH_URL }}" | xxd -ps + run: env && echo "var is: $FUNCTEST_PROJECT_NAME" From d3ef13f3c2c0f149e9d849ab2b28bb1be602df2f Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:14:38 +0200 Subject: [PATCH 29/61] add env variables --- .github/workflows/secrets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index a5a821018..fdab33401 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -15,4 +15,4 @@ jobs: AUTH_URL: ${{ secrets.AUTH_URL }} USERNAME: ${{ secrets.USERNAME }} FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} - run: env && echo "var is: $FUNCTEST_PROJECT_NAME" + run: env && echo "var is $FUNCTEST_PROJECT_NAME" From c32768db8cb080479fb71a523fef3330627394b3 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:21:21 +0200 Subject: [PATCH 30/61] add env variables --- .github/workflows/secrets.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index fdab33401..ab3e55e37 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -1,6 +1,9 @@ name: Show Me the S3cr3tz on: [push] +env: + ANOTHER_VAR: anyText + jobs: debug: name: Debug @@ -11,8 +14,8 @@ jobs: # uses: actions/checkout@v2 - name: Set up secret file - env: - AUTH_URL: ${{ secrets.AUTH_URL }} - USERNAME: ${{ secrets.USERNAME }} - FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} - run: env && echo "var is $FUNCTEST_PROJECT_NAME" +# env: +# AUTH_URL: ${{ secrets.AUTH_URL }} +# USERNAME: ${{ secrets.USERNAME }} +# FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} + run: env && echo ${{ env.ANOTHER_VAR }} && echo "var is $FUNCTEST_PROJECT_NAME" From aa62b9a0cbfdd2fa0649f332a1ef3ca57e3d8b78 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:22:52 +0200 Subject: [PATCH 31/61] add env variables --- .github/workflows/secrets.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index ab3e55e37..6f0784895 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -8,7 +8,7 @@ jobs: debug: name: Debug runs-on: ubuntu-latest - environment: ${{ vars.ENVIRONMENT_STAGE }} +# environment: ${{ vars.ENVIRONMENT_STAGE }} steps: # - name: Check out code # uses: actions/checkout@v2 @@ -18,4 +18,4 @@ jobs: # AUTH_URL: ${{ secrets.AUTH_URL }} # USERNAME: ${{ secrets.USERNAME }} # FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} - run: env && echo ${{ env.ANOTHER_VAR }} && echo "var is $FUNCTEST_PROJECT_NAME" + run: env && echo ${{ env.ANOTHER_VAR }} && echo ${{ vars }} && echo "var is $FUNCTEST_PROJECT_NAME" From df4e8c35f2491367d7135d8090f499d6ac0b621c Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:33:06 +0200 Subject: [PATCH 32/61] add env variables --- .github/workflows/secrets.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 6f0784895..5c6f2b484 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -8,7 +8,7 @@ jobs: debug: name: Debug runs-on: ubuntu-latest -# environment: ${{ vars.ENVIRONMENT_STAGE }} + environment: tests steps: # - name: Check out code # uses: actions/checkout@v2 @@ -18,4 +18,4 @@ jobs: # AUTH_URL: ${{ secrets.AUTH_URL }} # USERNAME: ${{ secrets.USERNAME }} # FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} - run: env && echo ${{ env.ANOTHER_VAR }} && echo ${{ vars }} && echo "var is $FUNCTEST_PROJECT_NAME" + run: env && echo ${{ tests.AUTH_URL }} && echo ${{ vars }} && echo "var is $FUNCTEST_PROJECT_NAME" From 22019fb839105c02c244e2d5fe65aa0e451753e3 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:36:32 +0200 Subject: [PATCH 33/61] add env variables --- .github/workflows/secrets.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 5c6f2b484..d8cb65be3 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -10,12 +10,12 @@ jobs: runs-on: ubuntu-latest environment: tests steps: -# - name: Check out code -# uses: actions/checkout@v2 + - name: Check out code + uses: actions/checkout@v3 - name: Set up secret file # env: # AUTH_URL: ${{ secrets.AUTH_URL }} # USERNAME: ${{ secrets.USERNAME }} # FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} - run: env && echo ${{ tests.AUTH_URL }} && echo ${{ vars }} && echo "var is $FUNCTEST_PROJECT_NAME" + run: env && echo ${{ secrets.AUTH_URL }} && echo ${{ vars }} && echo "var is $FUNCTEST_PROJECT_NAME" From b61b303bb53d471d344a8e8cf7afd7c101864208 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:39:11 +0200 Subject: [PATCH 34/61] add env variables --- .github/workflows/secrets.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index d8cb65be3..54f36c909 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -5,6 +5,23 @@ env: ANOTHER_VAR: anyText jobs: + acc_tests: + name: acceptance tests + runs-on: ubuntu-22.04 + environment: tests + # if: ${{ github.event.label.name == 'post' }} + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make acceptance + env: + AUTH_URL: ${{ secrets.AUTH_URL }} + PASSWORD: ${{ secrets.PASSWORD }} + USERNAME: ${{ secrets.USERNAME }} + USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} + FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} debug: name: Debug runs-on: ubuntu-latest From 428ce022712596ff9dd15e478a08db709869c889 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:42:59 +0200 Subject: [PATCH 35/61] add env variables --- .github/workflows/secrets.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 54f36c909..1ec57a645 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -17,11 +17,11 @@ jobs: go-version: "1.20" - run: make acceptance env: - AUTH_URL: ${{ secrets.AUTH_URL }} - PASSWORD: ${{ secrets.PASSWORD }} - USERNAME: ${{ secrets.USERNAME }} - USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} - FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} + OS_AUTH_URL: ${{ secrets.AUTH_URL }} + OS_PASSWORD: ${{ secrets.PASSWORD }} + OS_USERNAME: ${{ secrets.USERNAME }} + OS_USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} + OS_FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} debug: name: Debug runs-on: ubuntu-latest @@ -36,3 +36,5 @@ jobs: # USERNAME: ${{ secrets.USERNAME }} # FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} run: env && echo ${{ secrets.AUTH_URL }} && echo ${{ vars }} && echo "var is $FUNCTEST_PROJECT_NAME" + env: + FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} From 4b23147ed8cf41c5ad081a0c9f18a1a50c2ece97 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 14:57:08 +0200 Subject: [PATCH 36/61] add env variables --- .github/workflows/secrets.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 1ec57a645..7514f1526 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -21,14 +21,14 @@ jobs: OS_PASSWORD: ${{ secrets.PASSWORD }} OS_USERNAME: ${{ secrets.USERNAME }} OS_USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} - OS_FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} + OS_FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} debug: name: Debug runs-on: ubuntu-latest environment: tests steps: - name: Check out code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up secret file # env: @@ -37,4 +37,4 @@ jobs: # FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} run: env && echo ${{ secrets.AUTH_URL }} && echo ${{ vars }} && echo "var is $FUNCTEST_PROJECT_NAME" env: - FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} + FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} From 032b279033a4d2772f0d2a8e2a5d81ea0715424a Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 15:39:22 +0200 Subject: [PATCH 37/61] add env variables --- .github/workflows/secrets.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml index 7514f1526..d943fbf4b 100644 --- a/.github/workflows/secrets.yaml +++ b/.github/workflows/secrets.yaml @@ -18,10 +18,11 @@ jobs: - run: make acceptance env: OS_AUTH_URL: ${{ secrets.AUTH_URL }} + OS_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} OS_PASSWORD: ${{ secrets.PASSWORD }} OS_USERNAME: ${{ secrets.USERNAME }} - OS_USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} - OS_FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} + OS_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} + OS_REGION: "eu-de" debug: name: Debug runs-on: ubuntu-latest From b6263cf211520f95a0db7ecf94e110df3a721864 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 15:41:29 +0200 Subject: [PATCH 38/61] add env variables --- .github/workflows/otc-run-acc-tests.yaml | 15 +++++---- .github/workflows/secrets.yaml | 41 ------------------------ 2 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 .github/workflows/secrets.yaml diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index 4264cec6c..9c35c1440 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -9,17 +9,18 @@ jobs: acc_tests: name: acceptance tests runs-on: ubuntu-22.04 + environment: tests if: ${{ github.event.label.name == 'post' }} steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: "1.20" - - run: env && echo ${{secrets.AUTH_URL}} | sed 's/./& /g' && echo $AUTH_URL -# - run: make acceptance + - run: make acceptance env: - AUTH_URL: ${{ secrets.AUTH_URL }} - PASSWORD: ${{ secrets.PASSWORD }} - USERNAME: ${{ secrets.USERNAME }} - USER_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} - FUNCTEST_PROJECT_NAME: ${{ env.FUNCTEST_PROJECT_NAME }} + OS_AUTH_URL: ${{ secrets.AUTH_URL }} + OS_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} + OS_PASSWORD: ${{ secrets.PASSWORD }} + OS_USERNAME: ${{ secrets.USERNAME }} + OS_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} + OS_REGION: "eu-de" diff --git a/.github/workflows/secrets.yaml b/.github/workflows/secrets.yaml deleted file mode 100644 index d943fbf4b..000000000 --- a/.github/workflows/secrets.yaml +++ /dev/null @@ -1,41 +0,0 @@ -name: Show Me the S3cr3tz -on: [push] - -env: - ANOTHER_VAR: anyText - -jobs: - acc_tests: - name: acceptance tests - runs-on: ubuntu-22.04 - environment: tests - # if: ${{ github.event.label.name == 'post' }} - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make acceptance - env: - OS_AUTH_URL: ${{ secrets.AUTH_URL }} - OS_DOMAIN_NAME: ${{ secrets.USER_DOMAIN_NAME }} - OS_PASSWORD: ${{ secrets.PASSWORD }} - OS_USERNAME: ${{ secrets.USERNAME }} - OS_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} - OS_REGION: "eu-de" - debug: - name: Debug - runs-on: ubuntu-latest - environment: tests - steps: - - name: Check out code - uses: actions/checkout@v4 - - - name: Set up secret file -# env: -# AUTH_URL: ${{ secrets.AUTH_URL }} -# USERNAME: ${{ secrets.USERNAME }} -# FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} - run: env && echo ${{ secrets.AUTH_URL }} && echo ${{ vars }} && echo "var is $FUNCTEST_PROJECT_NAME" - env: - FUNCTEST_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} From 725460c0cc0413fd22c6791dea25c0e612ce9394 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Tue, 4 Jun 2024 15:58:26 +0200 Subject: [PATCH 39/61] add env variables --- .github/workflows/otc-golangci-lint.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 9a2720e42..84e230d74 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -4,9 +4,7 @@ on: pull_request: types: - opened - - closed - edited - - reopened - synchronize jobs: From 9a2861e704ebc100385b275c1c87247783e8fc53 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 13:53:51 +0200 Subject: [PATCH 40/61] check gate label --- .github/workflows/label-gate.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/label-gate.yaml diff --git a/.github/workflows/label-gate.yaml b/.github/workflows/label-gate.yaml new file mode 100644 index 000000000..46b756817 --- /dev/null +++ b/.github/workflows/label-gate.yaml @@ -0,0 +1,21 @@ +name: run tests + +on: + pull_request: + types: + - labeled + +jobs: + merge: + runs-on: ubuntu-latest + name: merge branch into devel + if: ${{ github.event.label.name == 'gate' && github.event.review.state == 'APPROVED' }} + steps: + - uses: actions/checkout@v4 + - uses: ./.github/workflows/otc-golangci-lint.yaml + - uses: ./.github/workflows/otc-run-acc-tests.yaml + - uses: devmasx/merge-branch@master + with: + label_name: 'gate' + target_branch: 'devel' + github_token: ${{ secrets.TOKEN }} From b61305d740da7b63ac5e4ebd3532e5781bcb8959 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 13:54:23 +0200 Subject: [PATCH 41/61] check gate label --- .github/workflows/label-gate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/label-gate.yaml b/.github/workflows/label-gate.yaml index 46b756817..b0326e61b 100644 --- a/.github/workflows/label-gate.yaml +++ b/.github/workflows/label-gate.yaml @@ -9,6 +9,7 @@ jobs: merge: runs-on: ubuntu-latest name: merge branch into devel + environment: github if: ${{ github.event.label.name == 'gate' && github.event.review.state == 'APPROVED' }} steps: - uses: actions/checkout@v4 From 80fa12e2ce66ddbc49ebcda376e3e0aa00033168 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 13:55:38 +0200 Subject: [PATCH 42/61] check gate label --- .zuul.yaml => .zuul.yaml.backup | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .zuul.yaml => .zuul.yaml.backup (100%) diff --git a/.zuul.yaml b/.zuul.yaml.backup similarity index 100% rename from .zuul.yaml rename to .zuul.yaml.backup From 6d722ecce367b4ff994d44a74661963a558ddd1a Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:07:44 +0200 Subject: [PATCH 43/61] check gate label --- .github/workflows/label-gate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label-gate.yaml b/.github/workflows/label-gate.yaml index b0326e61b..714b5011d 100644 --- a/.github/workflows/label-gate.yaml +++ b/.github/workflows/label-gate.yaml @@ -18,5 +18,5 @@ jobs: - uses: devmasx/merge-branch@master with: label_name: 'gate' - target_branch: 'devel' + target_branch: 'github-actions-1' github_token: ${{ secrets.TOKEN }} From 39db5c226a4258d8227fc1df82e71e099221e6f7 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:11:32 +0200 Subject: [PATCH 44/61] check gate label --- .github/workflows/label-gate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label-gate.yaml b/.github/workflows/label-gate.yaml index 714b5011d..e5b4fa08a 100644 --- a/.github/workflows/label-gate.yaml +++ b/.github/workflows/label-gate.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest name: merge branch into devel environment: github - if: ${{ github.event.label.name == 'gate' && github.event.review.state == 'APPROVED' }} + if: ${{ github.event.label.name == 'gate' }} steps: - uses: actions/checkout@v4 - uses: ./.github/workflows/otc-golangci-lint.yaml From a3a91fca87d704bce7e1333abd45f3ba83336ca7 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:21:09 +0200 Subject: [PATCH 45/61] check gate label --- .github/actions/code-quality/action.yaml | 40 ++++++++++++++++ .github/workflows/otc-golangci-lint.yaml | 60 +++++++++++++----------- 2 files changed, 73 insertions(+), 27 deletions(-) create mode 100644 .github/actions/code-quality/action.yaml diff --git a/.github/actions/code-quality/action.yaml b/.github/actions/code-quality/action.yaml new file mode 100644 index 000000000..84e230d74 --- /dev/null +++ b/.github/actions/code-quality/action.yaml @@ -0,0 +1,40 @@ +name: check code quality + +on: + pull_request: + types: + - opened + - edited + - synchronize + +jobs: + lint: + name: run golangci-lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - name: golangci-lint + uses: golangci/golangci-lint-action@v6 + with: + version: v1.53.3 + vet: + name: run go vet + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make vet + unit_tests: + name: run unit tests + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make test diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 84e230d74..75dd32077 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -9,32 +9,38 @@ on: jobs: lint: - name: run golangci-lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - name: golangci-lint - uses: golangci/golangci-lint-action@v6 - with: - version: v1.53.3 - vet: - name: run go vet - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make vet - unit_tests: - name: run unit tests - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make test + - name: run checks + uses: ./.github/actions/code-quality + +# lint: +# name: run golangci-lint +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# - uses: actions/setup-go@v5 +# with: +# go-version: "1.20" +# - name: golangci-lint +# uses: golangci/golangci-lint-action@v6 +# with: +# version: v1.53.3 +# vet: +# name: run go vet +# runs-on: ubuntu-22.04 +# steps: +# - uses: actions/checkout@v4 +# - uses: actions/setup-go@v5 +# with: +# go-version: "1.20" +# - run: make vet +# unit_tests: +# name: run unit tests +# runs-on: ubuntu-22.04 +# steps: +# - uses: actions/checkout@v4 +# - uses: actions/setup-go@v5 +# with: +# go-version: "1.20" +# - run: make test From e251bfce70113c1b6e92f7d8f6779256e7788464 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:22:06 +0200 Subject: [PATCH 46/61] check gate label --- .github/workflows/otc-golangci-lint.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 75dd32077..5b6bc096c 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -11,6 +11,7 @@ jobs: lint: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 - name: run checks uses: ./.github/actions/code-quality From cb9e6212ba5db929393cbde77bcadc39aa2c11e4 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:23:06 +0200 Subject: [PATCH 47/61] check gate label --- .github/workflows/otc-golangci-lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 5b6bc096c..5c48c77ff 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: run checks - uses: ./.github/actions/code-quality + uses: .github/actions/code-quality # lint: # name: run golangci-lint From 9814615405238d3920b5a2c1d9454e752507e132 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:34:24 +0200 Subject: [PATCH 48/61] refactoring --- .github/actions/code-quality/action.yaml | 70 +++++++++++------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/.github/actions/code-quality/action.yaml b/.github/actions/code-quality/action.yaml index 84e230d74..ea9932d5d 100644 --- a/.github/actions/code-quality/action.yaml +++ b/.github/actions/code-quality/action.yaml @@ -1,40 +1,36 @@ name: check code quality +#inputs: +# who-to-greet: # id of input +# description: 'Who to greet' +# required: true +# default: 'World' +#outputs: +# random-number: +# description: "Random number" +# value: ${{ steps.random-number-generator.outputs.random-number }} +runs: + using: "composite" + steps: -on: - pull_request: - types: - - opened - - edited - - synchronize + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - name: golangci-lint + uses: golangci/golangci-lint-action@v6 + with: + version: v1.53.3 -jobs: - lint: - name: run golangci-lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - name: golangci-lint - uses: golangci/golangci-lint-action@v6 - with: - version: v1.53.3 - vet: - name: run go vet - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make vet - unit_tests: - name: run unit tests - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make test + - name: run go vet + uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make vet + + - name: run unit tests + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make test From 4b5d97e420bb55db4c34f5dcd292cecfe7e48bfe Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:36:03 +0200 Subject: [PATCH 49/61] refactoring --- .github/workflows/otc-golangci-lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 5c48c77ff..5b6bc096c 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: run checks - uses: .github/actions/code-quality + uses: ./.github/actions/code-quality # lint: # name: run golangci-lint From 92e9f634f9bf0938f25e6eb5228165b2c19d99fc Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:40:50 +0200 Subject: [PATCH 50/61] refactoring --- .github/actions/code-quality/action.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/actions/code-quality/action.yaml b/.github/actions/code-quality/action.yaml index ea9932d5d..d5a9d4de7 100644 --- a/.github/actions/code-quality/action.yaml +++ b/.github/actions/code-quality/action.yaml @@ -27,10 +27,12 @@ runs: with: go-version: "1.20" - run: make vet + shell: bash - name: run unit tests - - uses: actions/checkout@v4 + uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: "1.20" - run: make test + shell: bash From dca03ae68d42806bae3163cd10ae624379479fd0 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:45:06 +0200 Subject: [PATCH 51/61] refactoring --- .github/workflows/otc-golangci-lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 5b6bc096c..39b6ebc91 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -11,7 +11,7 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 +# - uses: actions/checkout@v4 - name: run checks uses: ./.github/actions/code-quality From 3b4c23a08bb760f82477e0e4948bb96a5c206151 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:46:10 +0200 Subject: [PATCH 52/61] refactoring --- .github/actions/code-quality/action.yaml | 10 +++++----- .github/workflows/otc-golangci-lint.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/code-quality/action.yaml b/.github/actions/code-quality/action.yaml index d5a9d4de7..d2f7e78f3 100644 --- a/.github/actions/code-quality/action.yaml +++ b/.github/actions/code-quality/action.yaml @@ -12,7 +12,7 @@ runs: using: "composite" steps: - - uses: actions/checkout@v4 +# - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: "1.20" @@ -22,16 +22,16 @@ runs: version: v1.53.3 - name: run go vet - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 +# uses: actions/checkout@v4 + uses: actions/setup-go@v5 with: go-version: "1.20" - run: make vet shell: bash - name: run unit tests - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 +# uses: actions/checkout@v4 + uses: actions/setup-go@v5 with: go-version: "1.20" - run: make test diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 39b6ebc91..5b6bc096c 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -11,7 +11,7 @@ jobs: lint: runs-on: ubuntu-latest steps: -# - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - name: run checks uses: ./.github/actions/code-quality From 2fb81ec4cb36cc9364cf91130416accaf170427d Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 14:53:45 +0200 Subject: [PATCH 53/61] refactoring --- .github/actions/code-quality/action.yaml | 38 -------------- .github/workflows/otc-golangci-lint.yaml | 67 ++++++++++++------------ .github/workflows/otc-run-acc-tests.yaml | 10 ++++ 3 files changed, 44 insertions(+), 71 deletions(-) delete mode 100644 .github/actions/code-quality/action.yaml diff --git a/.github/actions/code-quality/action.yaml b/.github/actions/code-quality/action.yaml deleted file mode 100644 index d2f7e78f3..000000000 --- a/.github/actions/code-quality/action.yaml +++ /dev/null @@ -1,38 +0,0 @@ -name: check code quality -#inputs: -# who-to-greet: # id of input -# description: 'Who to greet' -# required: true -# default: 'World' -#outputs: -# random-number: -# description: "Random number" -# value: ${{ steps.random-number-generator.outputs.random-number }} -runs: - using: "composite" - steps: - -# - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - name: golangci-lint - uses: golangci/golangci-lint-action@v6 - with: - version: v1.53.3 - - - name: run go vet -# uses: actions/checkout@v4 - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make vet - shell: bash - - - name: run unit tests -# uses: actions/checkout@v4 - uses: actions/setup-go@v5 - with: - go-version: "1.20" - - run: make test - shell: bash diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 5b6bc096c..e8a3d1b68 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -6,42 +6,43 @@ on: - opened - edited - synchronize + workflow_call: + inputs: + config-path: + required: true + type: string + secrets: + envPAT: + required: true jobs: lint: + name: run golangci-lint runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: run checks - uses: ./.github/actions/code-quality - -# lint: -# name: run golangci-lint -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v4 -# - uses: actions/setup-go@v5 -# with: -# go-version: "1.20" -# - name: golangci-lint -# uses: golangci/golangci-lint-action@v6 -# with: -# version: v1.53.3 -# vet: -# name: run go vet -# runs-on: ubuntu-22.04 -# steps: -# - uses: actions/checkout@v4 -# - uses: actions/setup-go@v5 -# with: -# go-version: "1.20" -# - run: make vet -# unit_tests: -# name: run unit tests -# runs-on: ubuntu-22.04 -# steps: -# - uses: actions/checkout@v4 -# - uses: actions/setup-go@v5 -# with: -# go-version: "1.20" -# - run: make test + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - name: golangci-lint + uses: golangci/golangci-lint-action@v6 + with: + version: v1.53.3 + vet: + name: run go vet + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make vet + unit_tests: + name: run unit tests + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version: "1.20" + - run: make test diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index 9c35c1440..c8a7bcd33 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -4,6 +4,15 @@ on: pull_request: types: - labeled + workflow_call: + inputs: + config-path: + required: true + type: string + secrets: + envPAT: + required: true + jobs: acc_tests: @@ -16,6 +25,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" + - uses: .github/workflows/reusable-workflow.yml - run: make acceptance env: OS_AUTH_URL: ${{ secrets.AUTH_URL }} From 5739062f114b209d0172e1684840b24d7b682e42 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 15:01:56 +0200 Subject: [PATCH 54/61] refactoring --- .github/workflows/label-gate.yaml | 2 +- .github/workflows/otc-run-acc-tests.yaml | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/label-gate.yaml b/.github/workflows/label-gate.yaml index e5b4fa08a..c3d5e20fc 100644 --- a/.github/workflows/label-gate.yaml +++ b/.github/workflows/label-gate.yaml @@ -1,4 +1,4 @@ -name: run tests +name: merge branch on: pull_request: diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index c8a7bcd33..79f9fb590 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -4,15 +4,6 @@ on: pull_request: types: - labeled - workflow_call: - inputs: - config-path: - required: true - type: string - secrets: - envPAT: - required: true - jobs: acc_tests: @@ -25,7 +16,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" - - uses: .github/workflows/reusable-workflow.yml + - uses: ./.github/workflows/reusable-workflow.yml - run: make acceptance env: OS_AUTH_URL: ${{ secrets.AUTH_URL }} From c12f4f59fc842cbd6a433e2f414d37f001766645 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 15:04:19 +0200 Subject: [PATCH 55/61] refactoring --- .github/workflows/otc-run-acc-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index 79f9fb590..75ccf5294 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" - - uses: ./.github/workflows/reusable-workflow.yml + - uses: ./.github/workflows/otc-golangci-lint.yaml - run: make acceptance env: OS_AUTH_URL: ${{ secrets.AUTH_URL }} From 8e60c3b733e0ef3df288ed8e3cb8058e45718bb6 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 15:08:04 +0200 Subject: [PATCH 56/61] refactoring --- .github/workflows/otc-golangci-lint.yaml | 8 +------- .github/workflows/otc-run-acc-tests.yaml | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index e8a3d1b68..2d2ba2928 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -7,13 +7,7 @@ on: - edited - synchronize workflow_call: - inputs: - config-path: - required: true - type: string - secrets: - envPAT: - required: true + jobs: lint: diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/otc-run-acc-tests.yaml index 75ccf5294..c05cd8311 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/otc-run-acc-tests.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" - - uses: ./.github/workflows/otc-golangci-lint.yaml + - uses: .github/workflows/otc-golangci-lint.yaml - run: make acceptance env: OS_AUTH_URL: ${{ secrets.AUTH_URL }} From 828bb64d4f2b4c0d885823836c9b64f4c8b39f06 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 16:58:31 +0200 Subject: [PATCH 57/61] refactoring --- .github/workflows/label-gate.yaml | 7 +++++-- .../workflows/{otc-run-acc-tests.yaml => label-post.yaml} | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) rename .github/workflows/{otc-run-acc-tests.yaml => label-post.yaml} (92%) diff --git a/.github/workflows/label-gate.yaml b/.github/workflows/label-gate.yaml index c3d5e20fc..0d4664602 100644 --- a/.github/workflows/label-gate.yaml +++ b/.github/workflows/label-gate.yaml @@ -6,6 +6,11 @@ on: - labeled jobs: + run-checks: + runs-on: ubuntu-latest + if: ${{ github.event.label.name == 'gate' }} + steps: + - uses: ./.github/workflows/otc-golangci-lint.yaml merge: runs-on: ubuntu-latest name: merge branch into devel @@ -13,8 +18,6 @@ jobs: if: ${{ github.event.label.name == 'gate' }} steps: - uses: actions/checkout@v4 - - uses: ./.github/workflows/otc-golangci-lint.yaml - - uses: ./.github/workflows/otc-run-acc-tests.yaml - uses: devmasx/merge-branch@master with: label_name: 'gate' diff --git a/.github/workflows/otc-run-acc-tests.yaml b/.github/workflows/label-post.yaml similarity index 92% rename from .github/workflows/otc-run-acc-tests.yaml rename to .github/workflows/label-post.yaml index c05cd8311..9c35c1440 100644 --- a/.github/workflows/otc-run-acc-tests.yaml +++ b/.github/workflows/label-post.yaml @@ -16,7 +16,6 @@ jobs: - uses: actions/setup-go@v5 with: go-version: "1.20" - - uses: .github/workflows/otc-golangci-lint.yaml - run: make acceptance env: OS_AUTH_URL: ${{ secrets.AUTH_URL }} From 1097d471bfd6ca2f705b20a3998bd8e63ca66321 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 17:24:12 +0200 Subject: [PATCH 58/61] refactoring --- .github/workflows/label-gate.yaml | 25 ------------------- .../{label-post.yaml => labels.yaml} | 17 ++++++++++++- .github/workflows/otc-golangci-lint.yaml | 3 +-- 3 files changed, 17 insertions(+), 28 deletions(-) delete mode 100644 .github/workflows/label-gate.yaml rename .github/workflows/{label-post.yaml => labels.yaml} (51%) diff --git a/.github/workflows/label-gate.yaml b/.github/workflows/label-gate.yaml deleted file mode 100644 index 0d4664602..000000000 --- a/.github/workflows/label-gate.yaml +++ /dev/null @@ -1,25 +0,0 @@ -name: merge branch - -on: - pull_request: - types: - - labeled - -jobs: - run-checks: - runs-on: ubuntu-latest - if: ${{ github.event.label.name == 'gate' }} - steps: - - uses: ./.github/workflows/otc-golangci-lint.yaml - merge: - runs-on: ubuntu-latest - name: merge branch into devel - environment: github - if: ${{ github.event.label.name == 'gate' }} - steps: - - uses: actions/checkout@v4 - - uses: devmasx/merge-branch@master - with: - label_name: 'gate' - target_branch: 'github-actions-1' - github_token: ${{ secrets.TOKEN }} diff --git a/.github/workflows/label-post.yaml b/.github/workflows/labels.yaml similarity index 51% rename from .github/workflows/label-post.yaml rename to .github/workflows/labels.yaml index 9c35c1440..4d86240da 100644 --- a/.github/workflows/label-post.yaml +++ b/.github/workflows/labels.yaml @@ -10,7 +10,8 @@ jobs: name: acceptance tests runs-on: ubuntu-22.04 environment: tests - if: ${{ github.event.label.name == 'post' }} + if: ${{ contains(fromJSON('["post", "gate"]'), github.event.label.name) }} +# if: ${{ github.event.label.name == 'post' || github.event.label.name == 'gate'}} steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 @@ -24,3 +25,17 @@ jobs: OS_USERNAME: ${{ secrets.USERNAME }} OS_PROJECT_NAME: ${{ vars.FUNCTEST_PROJECT_NAME }} OS_REGION: "eu-de" + merge: + runs-on: ubuntu-latest + name: merge branch into devel + environment: github + needs: + - acc_tests + if: ${{ github.event.label.name == 'gate' && success() }} + steps: + - uses: actions/checkout@v4 + - uses: devmasx/merge-branch@master + with: + label_name: 'gate' + target_branch: 'github-actions-1' + github_token: ${{ secrets.TOKEN }} diff --git a/.github/workflows/otc-golangci-lint.yaml b/.github/workflows/otc-golangci-lint.yaml index 2d2ba2928..24c236291 100644 --- a/.github/workflows/otc-golangci-lint.yaml +++ b/.github/workflows/otc-golangci-lint.yaml @@ -6,8 +6,7 @@ on: - opened - edited - synchronize - workflow_call: - + - labeled jobs: lint: From 85f8e9ee7d1904faaae8f9a3451da2337263dec5 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 17:49:34 +0200 Subject: [PATCH 59/61] refactoring --- .github/workflows/labels.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml index 4d86240da..e41f3aed3 100644 --- a/.github/workflows/labels.yaml +++ b/.github/workflows/labels.yaml @@ -11,7 +11,6 @@ jobs: runs-on: ubuntu-22.04 environment: tests if: ${{ contains(fromJSON('["post", "gate"]'), github.event.label.name) }} -# if: ${{ github.event.label.name == 'post' || github.event.label.name == 'gate'}} steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 From 609352a99152686f0e7a6fe46f713651e52fccf3 Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 18:25:31 +0200 Subject: [PATCH 60/61] refactoring --- .github/workflows/labels.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml index e41f3aed3..e2af1295c 100644 --- a/.github/workflows/labels.yaml +++ b/.github/workflows/labels.yaml @@ -33,8 +33,13 @@ jobs: if: ${{ github.event.label.name == 'gate' && success() }} steps: - uses: actions/checkout@v4 + - uses: kattecon/gh-app-access-token-gen@v1 + id: gen_token + with: + app_id: ${{ secrets.APP_ID }} + private_key: ${{ secrets.APP_KEY }} - uses: devmasx/merge-branch@master with: label_name: 'gate' target_branch: 'github-actions-1' - github_token: ${{ secrets.TOKEN }} + github_token: ${{ steps.gen_token.outputs.token }} From 2e932fdbe4a884655af50e1e68aab1ccfafceb7b Mon Sep 17 00:00:00 2001 From: Sergei Martynov Date: Wed, 5 Jun 2024 18:49:57 +0200 Subject: [PATCH 61/61] refactoring --- .github/workflows/labels.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labels.yaml b/.github/workflows/labels.yaml index e2af1295c..f0e315c79 100644 --- a/.github/workflows/labels.yaml +++ b/.github/workflows/labels.yaml @@ -41,5 +41,5 @@ jobs: - uses: devmasx/merge-branch@master with: label_name: 'gate' - target_branch: 'github-actions-1' + target_branch: 'devel' github_token: ${{ steps.gen_token.outputs.token }}