Merge pull request #269 from Shinsina/staging-environment

Deploy staging domains onto staging envrionment (Leonis)
parameter1 · Oct 17, 2023 · 60f61cd · 60f61cd
2 parents 1ebcb42 + b53b78f
commit 60f61cd
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 14 deletions.
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -26,15 +26,15 @@ jobs:
 
   post-deploy-failure:
     if: failure()
-    needs: [notify-start, deploy-sites]
+    needs: [notify-start, build-sites, deploy-sites]
     uses: parameter1/actions/.github/workflows/notify-fail.yml@main
     secrets: inherit
     with:
       slack-thread: ${{ needs.notify-start.outputs.slack-thread }}
 
   post-deploy-complete:
     if: success()
-    needs: [notify-start, deploy-sites]
+    needs: [notify-start, build-sites, deploy-sites]
     uses: parameter1/actions/.github/workflows/notify-complete.yml@main
     secrets: inherit
     with:

diff --git a/.github/workflows/deploy-staging.yml b/.github/workflows/deploy-staging.yml
@@ -25,15 +25,15 @@ jobs:
 
   post-deploy-failure:
     if: failure()
-    needs: [notify-start, deploy-sites]
+    needs: [notify-start, build-sites, deploy-sites]
     uses: parameter1/actions/.github/workflows/notify-fail.yml@main
     secrets: inherit
     with:
       slack-thread: ${{ needs.notify-start.outputs.slack-thread }}
 
   post-deploy-complete:
     if: success()
-    needs: [notify-start, deploy-sites]
+    needs: [notify-start, build-sites, deploy-sites]
     uses: parameter1/actions/.github/workflows/notify-complete.yml@main
     secrets: inherit
     with:
@@ -53,9 +53,9 @@ jobs:
         ###############################################
         site:
           - { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
-          - { dir: diverseeducation.com, stack: virgon, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
-          - { dir: diversemilitary.net, stack: virgon, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
-          - { dir: divhealth.net, stack: virgon, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }
+          - { dir: diverseeducation.com, stack: leonis, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
+          - { dir: diversemilitary.net, stack: leonis, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
+          - { dir: divhealth.net, stack: leonis, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }
         ###############################################
         #^# Make sure this matches the site matrix! #^#
         ###############################################
@@ -76,9 +76,9 @@ jobs:
         ###############################################
         site:
           - { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
-          - { dir: diverseeducation.com, stack: virgon, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
-          - { dir: diversemilitary.net, stack: virgon, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
-          - { dir: divhealth.net, stack: virgon, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }
+          - { dir: diverseeducation.com, stack: leonis, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
+          - { dir: diversemilitary.net, stack: leonis, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
+          - { dir: divhealth.net, stack: leonis, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }
         ###############################################
         #^# Make sure this matches the site matrix! #^#
         ###############################################

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -16,6 +16,9 @@ jobs:
         ###############################################
         site:
           - { dir: ccnewsnow.com, stack: virgon, id: 60c28bc3d28860bc334ebcb2, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-ccnewsnow.com }
+          - { dir: diverseeducation.com, stack: leonis, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
+          - { dir: diversemilitary.net, stack: leonis, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
+          - { dir: divhealth.net, stack: leonis, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }
           - { dir: diverseeducation.com, stack: virgon, id: 60c281c6d28860bc33464ae0, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diverseeducation.com }
           - { dir: diversemilitary.net, stack: virgon, id: 60c28c0dd28860bc334ed723, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-diversemilitary.net }
           - { dir: divhealth.net, stack: virgon, id: 60c28c4bd28860bc334f485d, account: diverse, tenant: diverse_all, rancher_label: cox-matthews-associates-divhealth.net }

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -31,6 +31,12 @@ x-env-defaults: &env
   ENABLE_CONTENT_METER: ${ENABLE_CONTENT_METER-false}
   IDX_NAV_ENABLE: ${IDX_NAV_ENABLE-false}
 
+x-env-leonis: &env-leonis
+  GRAPHQL_URI: ${GRAPHQL_URI-https://graphql.leonis.base.parameter1.com}
+  OEMBED_URI: ${OEMBED_URI-https://oembed.leonis.base.parameter1.com}
+  RSS_URI: ${RSS_URI-https://rss.leonis.base.parameter1.com}
+  SITEMAPS_URI: ${SITEMAPS_URI-https://sitemaps.leonis.base.parameter1.com}
+
 x-env-virgon: &env-virgon
   GRAPHQL_URI: ${GRAPHQL_URI-https://virgon.graphql.base.parameter1.com}
   OEMBED_URI: ${OEMBED_URI-https://virgon.oembed.base.parameter1.com}

diff --git a/sites/ccnewsnow.com/package.json b/sites/ccnewsnow.com/package.json
@@ -11,7 +11,12 @@
     "account": "diverse",
     "stack": "virgon",
     "key": "ccn",
-    "deploy": true
+    "deploy": {
+      "production": true,
+      "staging": {
+        "stack": "leonis"
+      }
+    }
   },
   "scripts": {
     "dev": "basecms-website dev --compile-dir ../../packages --watch-dir ../../packages --purge-css-content-dir ../../packages --purge-css-content-dir ../../node_modules/@parameter1",

diff --git a/sites/diverseeducation.com/package.json b/sites/diverseeducation.com/package.json
@@ -11,7 +11,12 @@
     "account": "diverse",
     "stack": "virgon",
     "key": "de",
-    "deploy": true
+    "deploy": {
+      "production": true,
+      "staging": {
+        "stack": "leonis"
+      }
+    }
   },
   "scripts": {
     "dev": "basecms-website dev --compile-dir ../../packages --watch-dir ../../packages --purge-css-content-dir ../../packages --purge-css-content-dir ../../node_modules/@parameter1",

diff --git a/sites/diversemilitary.net/package.json b/sites/diversemilitary.net/package.json
@@ -11,7 +11,12 @@
     "account": "diverse",
     "stack": "virgon",
     "key": "dm",
-    "deploy": true
+    "deploy": {
+      "production": true,
+      "staging": {
+        "stack": "leonis"
+      }
+    }
   },
   "scripts": {
     "dev": "basecms-website dev --compile-dir ../../packages --watch-dir ../../packages --purge-css-content-dir ../../packages --purge-css-content-dir ../../node_modules/@parameter1",

diff --git a/sites/divhealth.net/package.json b/sites/divhealth.net/package.json
@@ -11,7 +11,12 @@
     "account": "diverse",
     "stack": "virgon",
     "key": "dh",
-    "deploy": true
+    "deploy": {
+      "production": true,
+      "staging": {
+        "stack": "leonis"
+      }
+    }
   },
   "scripts": {
     "dev": "basecms-website dev --compile-dir ../../packages --watch-dir ../../packages --purge-css-content-dir ../../packages --purge-css-content-dir ../../node_modules/@parameter1",