merging 5240/5248/5255/5256/5258 to prod

.circleci/config.yml

@@ -203,12 +203,6 @@ jobs:
             hubploy deploy --timeout 30m data8 hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
-#      - run:
-#          name: Deploy data8xv2
-#          command: |
-#            hubploy deploy --timeout 30m data8xv2 hub ${CIRCLE_BRANCH}
-#          no_output_timeout: 30m
-
       - run:
           name: Deploy data100
           command: |
@@ -245,6 +239,12 @@ jobs:
             hubploy deploy --timeout 30m dlab hub ${CIRCLE_BRANCH}
           no_output_timeout: 30m
 
+      - run:
+          name: Deploy edx
+          command: |
+            hubploy deploy --timeout 30m edx hub ${CIRCLE_BRANCH}
+          no_output_timeout: 30m
+
       - run:
           name: Deploy eecs
           command: |
@@ -481,15 +481,6 @@ workflows:
                 ignore:
                 - staging
                 - prod
-#      - hubploy/build-image:
-#          deployment: data8xv2
-#          name: data8xv2 image build
-#          # Filters can only be per-job? wtf
-#          filters:
-#              branches:
-#                ignore:
-#                - staging
-#                - prod
       - hubploy/build-image:
           deployment: data100
           name: data100 image build
@@ -537,6 +528,15 @@ workflows:
                 ignore:
                 - staging
                 - prod
+      - hubploy/build-image:
+          deployment: edx
+          name: edx image build
+          # Filters can only be per-job? wtf
+          filters:
+              branches:
+                ignore:
+                - staging
+                - prod
       - hubploy/build-image:
           deployment: eecs
           name: eecs image build
@@ -648,15 +648,6 @@ workflows:
               branches:
                 only:
                 - staging
-#      - hubploy/build-image:
-#          deployment: data8xv2
-#          name: data8xv2 image build
-#          push: true
-#          # Filters can only be per-job? wtf
-#          filters:
-#              branches:
-#                only:
-#                - staging
       - hubploy/build-image:
           deployment: data100
           name: data100 image build
@@ -701,6 +692,15 @@ workflows:
               branches:
                 only:
                 - staging
+      - hubploy/build-image:
+          deployment: edx
+          name: edx image build
+          push: true
+          # Filters can only be per-job? wtf
+          filters:
+              branches:
+                only:
+                - staging
       - hubploy/build-image:
           deployment: eecs
           name: eecs image build
@@ -784,12 +784,12 @@ workflows:
               - biology image build
               - cee image build
               - data8 image build
-#              - data8xv2 image build
               - data100 image build
               - data101 image build
               - data102 image build
               - datahub image build
               - dev-r image build
+              - edx image build
               - eecs image build
               - ischool image build
               - julia hub image build

.github/labeler.yml

@@ -93,10 +93,6 @@ node-placeholder-scaler:
   - 'deployments/data102/**'
 'hub: data8':
   - 'deployments/data8/**'
-#'hub: data8x':
-#  - 'deployments/data8x/**'
-'hub: data8xv2':
-  - 'deployments/data8xv2/**'
 'hub: datahub':
   - 'deployments/datahub/**'
 'hub: dlab':

.gitignore

@@ -10,3 +10,5 @@ hub/charts
 # python
 **/__pycache__
 **/*.pyc
+
+**/.DS_Store