Merge pull request #26 from BrownUniversity/qa

Updated nginx version
BrownUniversity · May 22, 2023 · d58a0a7 · d58a0a7
2 parents 76c3d69 + fcde563
commit d58a0a7
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 9 deletions.
diff --git a/.blackbox/blackbox-files.txt b/.blackbox/blackbox-files.txt
@@ -6,6 +6,7 @@ files/dev-bkpd.yaml
 files/dev-bkpi.yaml
 files/qa-bkpd.yaml
 files/qa-bkpi.yaml
+files/robot.dev
 files/robot.dr
 files/robot.prod
 files/robot.qa
diff --git a/.github/workflows/dev-build-deploy.yaml b/.github/workflows/dev-build-deploy.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   Delete_and_Deploy_bkeXtest:
-    runs-on: self-hosted
+    runs-on: [self-hosted, qa-ghrunner]
     steps:
       -
         name: Checkout
@@ -20,7 +20,13 @@ jobs:
         name: Get kubectl
         uses: azure/setup-kubectl@v3
         with:
-          version: v1.20.0
+          version: v1.22.0
+      -
+        name: Build
+        run: make build
+      -
+        name: Push
+        run: make push.dev
       -
         name: Delete
         run: make delete.dev

diff --git a/.github/workflows/dr-build-deploy.yaml b/.github/workflows/dr-build-deploy.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   Building_and_Deploying_bkeXtest:
-    runs-on: self-hosted
+    runs-on: [self-hosted, ghrunner]
     steps:
       -
         name: Checkout
@@ -19,7 +19,7 @@ jobs:
         name: Get kubectl
         uses: azure/setup-kubectl@v3
         with:
-          version: v1.20.0
+          version: v1.22.0
       -
         name: Build
         run: make build

diff --git a/.github/workflows/prod-build-deploy.yaml b/.github/workflows/prod-build-deploy.yaml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   Building_and_Deploying_bkeXtest:
-    runs-on: self-hosted
+    runs-on: [self-hosted, ghrunner]
     steps:
       -
         name: Checkout
@@ -19,7 +19,7 @@ jobs:
         name: Get kubectl
         uses: azure/setup-kubectl@v3
         with:
-          version: v1.20.0
+          version: v1.22.0
       -
         name: Build
         run: make build

diff --git a/.github/workflows/qa-build-deploy.yaml b/.github/workflows/qa-build-deploy.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   Building_and_Deploying_bkeXtest:
-    runs-on: self-hosted
+    runs-on: [self-hosted, qa-ghrunner]
     steps:
       -
         name: Checkout
@@ -20,7 +20,7 @@ jobs:
         name: Get kubectl
         uses: azure/setup-kubectl@v3
         with:
-          version: v1.20.0
+          version: v1.22.0
       -
         name: Build
         run: make build

diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@
 /files/qa-bkpi.yaml
 /files/dev-bkpi.yaml
 /files/dev-bkpd.yaml
+/files/robot.dev
diff --git a/Makefile b/Makefile
@@ -28,10 +28,14 @@ decrypt: files/bkpidr.yaml
 
 #build: @ Build bkextest image
 build: 
-	docker build -t harbor.services.brown.edu/bkextest/bkextest -t harbor.cis-qas.brown.edu/bkextest/bkextest -t harbordr.services.brown.edu/bkextest/bkextest ./
+	docker build -t harbor.services.brown.edu/bkextest/bkextest -t harbor.cis-qas.brown.edu/bkextest/bkextest -t harbordr.services.brown.edu/bkextest/bkextest -t harbor.cis-dev.brown.edu/bkextest/bkextest ./
 
 ## Docker Logins
 
+#dlogin.dev: @ dev docker login
+dlogin.dev: files/robot.dev
+	cat files/robot.dev | docker login -u 'bke-bkextest+bkextest' --password-stdin harbor.cis-dev.brown.edu
+
 #dlogin.qa: @ qa docker login
 dlogin.qa: files/robot.qa
 	cat files/robot.qa | docker login -u 'bke-bkextest+bkextest' --password-stdin harbor.cis-qas.brown.edu
@@ -46,6 +50,10 @@ dlogin.dr: files/robot.dr
 
 ## Harbor push
 
+#push.dev: @ Push to DEV harbor
+push.dev: dlogin.dev
+	docker push harbor.cis-dev.brown.edu/bkextest/bkextest
+
 #push.qa: @ Push to QA harbor
 push.qa: dlogin.qa
 	docker push harbor.cis-qas.brown.edu/bkextest/bkextest

diff --git a/files/dev-bkpd.yaml.gpg b/files/dev-bkpd.yaml.gpg
diff --git a/files/dev-bkpi.yaml.gpg b/files/dev-bkpi.yaml.gpg
diff --git a/files/robot.dev.gpg b/files/robot.dev.gpg