Merge branch 'master' into fix/secondary-subnet

uc-cdis · Dec 7, 2022 · f4533be · f4533be
2 parents 6539b34 + 54fe928
commit f4533be
Show file tree

Hide file tree

Showing 107 changed files with 2,147 additions and 662 deletions.
diff --git a/.github/workflows/image_build_push_jenkins.yaml b/.github/workflows/image_build_push_jenkins.yaml
@@ -0,0 +1,60 @@
+name: Build Jenkins images and push to Quay
+
+on: 
+  push:
+    paths:
+      - Docker/jenkins/**
+
+jobs:
+  jenkins:
+    name: Jenkins Build and Push
+    uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
+    with:
+      DOCKERFILE_LOCATION: "./Docker/jenkins/Jenkins/Dockerfile"
+      DOCKERFILE_BUILD_CONTEXT: "./Docker/jenkins/Jenkins"
+      OVERRIDE_REPO_NAME: "jenkins"
+      USE_QUAY_ONLY: true
+    secrets:
+      ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+      ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+      QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
+      QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}    
+  jenkins2:
+    name: Jenkins2 Build and Push
+    uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
+    with:
+      DOCKERFILE_LOCATION: "./Docker/jenkins/Jenkins2/Dockerfile"
+      DOCKERFILE_BUILD_CONTEXT: "./Docker/jenkins/Jenkins2"
+      OVERRIDE_REPO_NAME: "jenkins2"
+      USE_QUAY_ONLY: true
+    secrets:
+      ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+      ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+      QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
+      QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
+  jenkins-ci-worker:
+    name: Jenkins-CI-Worker Build and Push
+    uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
+    with:
+      DOCKERFILE_LOCATION: "./Docker/jenkins/Jenkins-CI-Worker/Dockerfile"
+      DOCKERFILE_BUILD_CONTEXT: "./Docker/jenkins/Jenkins-CI-Worker"
+      OVERRIDE_REPO_NAME: "gen3-ci-worker"
+      USE_QUAY_ONLY: true
+    secrets:
+      ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+      ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+      QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
+      QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
+  jenkins-qa-worker:
+    name: Jenkins-QA-Worker Build and Push
+    uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master
+    with:
+      DOCKERFILE_LOCATION: "./Docker/jenkins/Jenkins-Worker/Dockerfile"
+      DOCKERFILE_BUILD_CONTEXT: "./Docker/jenkins/Jenkins-Worker"
+      OVERRIDE_REPO_NAME: "gen3-qa-worker"
+      USE_QUAY_ONLY: true
+    secrets:
+      ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
+      ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
+      QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
+      QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2022-06-21T21:12:27Z",
+  "generated_at": "2022-11-17T21:04:51Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -79,7 +79,7 @@
         "hashed_secret": "10daf3a26c6a17242a5ab2438a12ebc8276c7603",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 124,
+        "line_number": 122,
         "type": "Secret Keyword"
       }
     ],
@@ -88,7 +88,7 @@
         "hashed_secret": "10daf3a26c6a17242a5ab2438a12ebc8276c7603",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 138,
+        "line_number": 136,
         "type": "Secret Keyword"
       }
     ],
@@ -97,7 +97,7 @@
         "hashed_secret": "10daf3a26c6a17242a5ab2438a12ebc8276c7603",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 113,
+        "line_number": 110,
         "type": "Secret Keyword"
       }
     ],
@@ -426,21 +426,21 @@
         "hashed_secret": "40304f287a52d99fdbe086ad19dbdbf9cc1b3897",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 32,
+        "line_number": 38,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "d3df8a3b08a9de43b73eca1302d50e7a0e5b360f",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 49,
+        "line_number": 55,
         "type": "Secret Keyword"
       },
       {
         "hashed_secret": "9f29ed52bc91ba45b309d5234e95edc7ca5286fd",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 51,
+        "line_number": 57,
         "type": "Secret Keyword"
       }
     ],
@@ -740,7 +740,7 @@
         "hashed_secret": "52330dffa4d0795b4199a66428e54eca228e1661",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 15,
+        "line_number": 20,
         "type": "Secret Keyword"
       }
     ],
@@ -2235,12 +2235,21 @@
         "type": "Secret Keyword"
       }
     ],
+    "tf_files/aws/eks/sample.tfvars": [
+      {
+        "hashed_secret": "83c1003f406f34fba4d6279a948fee3abc802884",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 107,
+        "type": "Hex High Entropy String"
+      }
+    ],
     "tf_files/aws/eks/variables.tf": [
       {
         "hashed_secret": "83c1003f406f34fba4d6279a948fee3abc802884",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 135,
+        "line_number": 133,
         "type": "Hex High Entropy String"
       }
     ],
@@ -2412,15 +2421,6 @@
         "type": "Hex High Entropy String"
       }
     ],
-    "tf_files/aws/rds/sample.tfvars": [
-      {
-        "hashed_secret": "76c3c4836dee37d8d0642949f84092a9a24bbf46",
-        "is_secret": false,
-        "is_verified": false,
-        "line_number": 7,
-        "type": "Secret Keyword"
-      }
-    ],
     "tf_files/aws/slurm/README.md": [
       {
         "hashed_secret": "fd85d792fa56981cf6a8d2a5c0857c74af86e99d",