From 35242b8ef811bc55964d8e7207f5df77238b3ec4 Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 24 Aug 2023 01:13:59 +0000 Subject: [PATCH 1/9] Add .gitea/workflows/test-libyan.yml --- .gitea/workflows/test-libyan.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .gitea/workflows/test-libyan.yml diff --git a/.gitea/workflows/test-libyan.yml b/.gitea/workflows/test-libyan.yml new file mode 100644 index 0000000..37a044d --- /dev/null +++ b/.gitea/workflows/test-libyan.yml @@ -0,0 +1,17 @@ +name: LIBYAN_TEST +run-name: ${{ gitea.actor }} LITYAN_TEST +on: + pull_request: + branches: [ master ] + +env: + GITEA_TOKEN: ${{ secrets.ELYSIUM_ORG_READ_TOKEN }} + KUBECONFIG_BASE64: ${{ secrets.KUBECONFIG_USW_DEV }} +jobs: + libyan-test: + steps: + - name: Libyan Config + uses: elysium/libyan + - name: list + run: | + ls -lah \ No newline at end of file From a63046dbf25c9a4504ec633c5a675d55f2c3095e Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 24 Aug 2023 01:15:19 +0000 Subject: [PATCH 2/9] Update .gitea/workflows/test-libyan.yml --- .gitea/workflows/test-libyan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-libyan.yml b/.gitea/workflows/test-libyan.yml index 37a044d..0b58468 100644 --- a/.gitea/workflows/test-libyan.yml +++ b/.gitea/workflows/test-libyan.yml @@ -11,7 +11,7 @@ jobs: libyan-test: steps: - name: Libyan Config - uses: elysium/libyan + uses: elysium/libyan@master - name: list run: | ls -lah \ No newline at end of file From b67adb71e6806c54b89265d009f8b42bd9f177c0 Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 24 Aug 2023 01:18:39 +0000 Subject: [PATCH 3/9] Update .gitea/workflows/test-libyan.yml --- .gitea/workflows/test-libyan.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitea/workflows/test-libyan.yml b/.gitea/workflows/test-libyan.yml index 0b58468..0b02532 100644 --- a/.gitea/workflows/test-libyan.yml +++ b/.gitea/workflows/test-libyan.yml @@ -12,6 +12,8 @@ jobs: steps: - name: Libyan Config uses: elysium/libyan@master + with: + gitea-token: ${{ env.GITEA_TOKEN }} - name: list run: | ls -lah \ No newline at end of file From 01e904dd410a4a05db76012c9f79f27a282c5cd4 Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 24 Aug 2023 01:25:39 +0000 Subject: [PATCH 4/9] Update .gitea/workflows/test-libyan.yml --- .gitea/workflows/test-libyan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-libyan.yml b/.gitea/workflows/test-libyan.yml index 0b02532..ade2ebd 100644 --- a/.gitea/workflows/test-libyan.yml +++ b/.gitea/workflows/test-libyan.yml @@ -11,7 +11,7 @@ jobs: libyan-test: steps: - name: Libyan Config - uses: elysium/libyan@master + uses: https://gitea.dunemask.net/elysium/libyan@master with: gitea-token: ${{ env.GITEA_TOKEN }} - name: list From b83d06aebe58ba0e8ed9ff4359f7bfba12d41ae5 Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 24 Aug 2023 14:32:29 +0000 Subject: [PATCH 5/9] Update .gitea/workflows/test-libyan.yml --- .gitea/workflows/test-libyan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/test-libyan.yml b/.gitea/workflows/test-libyan.yml index ade2ebd..7ec99ce 100644 --- a/.gitea/workflows/test-libyan.yml +++ b/.gitea/workflows/test-libyan.yml @@ -16,4 +16,4 @@ jobs: gitea-token: ${{ env.GITEA_TOKEN }} - name: list run: | - ls -lah \ No newline at end of file + garden deploy nile --env usw-ci \ No newline at end of file From 0018f1025d28062201b1ff717906a030f1d4bafc Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 24 Aug 2023 14:35:32 +0000 Subject: [PATCH 6/9] Update .gitea/workflows/test-libyan.yml --- .gitea/workflows/test-libyan.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/test-libyan.yml b/.gitea/workflows/test-libyan.yml index 7ec99ce..cbce199 100644 --- a/.gitea/workflows/test-libyan.yml +++ b/.gitea/workflows/test-libyan.yml @@ -16,4 +16,5 @@ jobs: gitea-token: ${{ env.GITEA_TOKEN }} - name: list run: | - garden deploy nile --env usw-ci \ No newline at end of file + garden deploy nile --env usw-ci + working-directory: ${{ env.OASIS_WORKSPACE }} \ No newline at end of file From 8e4f1d8040b8e551e34418c41613f987cbc71ec4 Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 24 Aug 2023 14:38:27 +0000 Subject: [PATCH 7/9] Update .gitea/workflows/test-libyan.yml --- .gitea/workflows/test-libyan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/test-libyan.yml b/.gitea/workflows/test-libyan.yml index cbce199..43f695c 100644 --- a/.gitea/workflows/test-libyan.yml +++ b/.gitea/workflows/test-libyan.yml @@ -14,6 +14,7 @@ jobs: uses: https://gitea.dunemask.net/elysium/libyan@master with: gitea-token: ${{ env.GITEA_TOKEN }} + kubeconfig: ${{ env.KUBECONFIG_BASE64 }} - name: list run: | garden deploy nile --env usw-ci From efc928c242a8f80cc5b6231b6d7ff971dd58c2df Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 24 Aug 2023 15:09:33 +0000 Subject: [PATCH 8/9] Update .gitea/workflows/deploy-edge.yml --- .gitea/workflows/deploy-edge.yml | 24 ++++++++++++++++++++++++ .gitea/workflows/test-libyan.yml | 21 --------------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 .gitea/workflows/deploy-edge.yml delete mode 100644 .gitea/workflows/test-libyan.yml diff --git a/.gitea/workflows/deploy-edge.yml b/.gitea/workflows/deploy-edge.yml new file mode 100644 index 0000000..3865356 --- /dev/null +++ b/.gitea/workflows/deploy-edge.yml @@ -0,0 +1,24 @@ +name: Deploy Edge +run-name: ${{ gitea.actor }} Deploy Edge +on: + push: + branches: [ master ] + +env: + GITEA_TOKEN: ${{ secrets.ELYSIUM_ORG_READ_TOKEN }} + KUBECONFIG_BASE64: ${{ secrets.KUBECONFIG_USW_EDGE }} + OASIS_PROD_CONFIG: ${{ secrets.OASIS_PROD_CONFIG }} + GARDEN_DEPLOY_ACTION: khufu + +jobs: + deploy-edge: + steps: + - name: Oasis Setup + uses: https://gitea.dunemask.net/elysium/libyan@master + with: + gitea-token: ${{ env.GITEA_TOKEN }} + kubeconfig: ${{ env.KUBECONFIG_BASE64 }} + oasis-prod-config: ${{ env. OASIS_PROD_CONFIG }} + - name: Deploy to Edge env + run: garden deploy $GARDEN_DEPLOY_ACTION --env usw-edge + working-directory: ${{ env.OASIS_WORKSPACE }} \ No newline at end of file diff --git a/.gitea/workflows/test-libyan.yml b/.gitea/workflows/test-libyan.yml deleted file mode 100644 index 43f695c..0000000 --- a/.gitea/workflows/test-libyan.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: LIBYAN_TEST -run-name: ${{ gitea.actor }} LITYAN_TEST -on: - pull_request: - branches: [ master ] - -env: - GITEA_TOKEN: ${{ secrets.ELYSIUM_ORG_READ_TOKEN }} - KUBECONFIG_BASE64: ${{ secrets.KUBECONFIG_USW_DEV }} -jobs: - libyan-test: - steps: - - name: Libyan Config - uses: https://gitea.dunemask.net/elysium/libyan@master - with: - gitea-token: ${{ env.GITEA_TOKEN }} - kubeconfig: ${{ env.KUBECONFIG_BASE64 }} - - name: list - run: | - garden deploy nile --env usw-ci - working-directory: ${{ env.OASIS_WORKSPACE }} \ No newline at end of file From 94f631898335902ba12c0474cf0cabca8cd72295 Mon Sep 17 00:00:00 2001 From: dunemask Date: Thu, 24 Aug 2023 15:09:59 +0000 Subject: [PATCH 9/9] Update .gitea/workflows/deploy-edge.yml --- .gitea/workflows/deploy-edge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/deploy-edge.yml b/.gitea/workflows/deploy-edge.yml index 3865356..60d2550 100644 --- a/.gitea/workflows/deploy-edge.yml +++ b/.gitea/workflows/deploy-edge.yml @@ -19,6 +19,6 @@ jobs: gitea-token: ${{ env.GITEA_TOKEN }} kubeconfig: ${{ env.KUBECONFIG_BASE64 }} oasis-prod-config: ${{ env. OASIS_PROD_CONFIG }} - - name: Deploy to Edge env - run: garden deploy $GARDEN_DEPLOY_ACTION --env usw-edge + - name: Deploy to Edge env + run: garden deploy $GARDEN_DEPLOY_ACTION --env usw-edge working-directory: ${{ env.OASIS_WORKSPACE }} \ No newline at end of file