Merge branch 'CoffeaTeam:master' into master

mat-adamec · Jun 9, 2022 · 560260f · 560260f
2 parents 46f7e51 + bc626df
commit 560260f
Show file tree

Hide file tree

Showing 135 changed files with 4,074 additions and 2,717 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,26 +6,6 @@
 version: 2
 updates:
   - package-ecosystem: "docker"
-    directory: "/docker/coffea-casa"
-    schedule:
-      interval: "daily"
-
-  - package-ecosystem: "docker"
-    directory: "/docker/coffea-casa-analysis"
-    schedule:
-      interval: "daily"
-
-  - package-ecosystem: "docker"
-    directory: "/docker/coffea-casa-cc7"
-    schedule:
-      interval: "daily"
-
-  - package-ecosystem: "docker"
-    directory: "/docker/coffea-casa-analysis-cc7"
-    schedule:
-      interval: "daily"
-
-  - package-ecosystem: "docker"
-    directory: "/chart/coffea-casa/docker/k8s-hub-coffea-casa"
+    directory: "/docker/"
     schedule:
       interval: "daily"
diff --git a/.github/workflows/charts-lint.yml b/.github/workflows/charts-lint.yml
@@ -1,6 +1,9 @@
 name: Lint and Test Charts
 
-on: pull_request
+on:
+  pull_request:
+    paths:
+      - './charts/**'
 
 jobs:
   lint-test:
@@ -14,7 +17,7 @@ jobs:
       - name: Set up Helm
         uses: azure/setup-helm@v1
         with:
-          version: v3.4.0
+          version: v3.5.3
 
       - uses: actions/setup-python@v2
         with:
@@ -32,11 +35,4 @@ jobs:
           fi
 
       - name: Run chart-testing (lint)
-        run: ct lint
-
-      #- name: Create kind cluster
-      #  uses: helm/[email protected]
-      #  if: steps.list-changed.outputs.changed == 'true'
-
-      #- name: Run chart-testing (install)
-      #  run: ct install
+        run: ct lint --check-version-increment=false --validate-maintainers=false
diff --git a/.github/workflows/dockercd-harbor-analysis-cc7.yml_disable b/.github/workflows/dockercd-harbor-analysis-cc7.yml_disable
@@ -0,0 +1,48 @@
+# Create release only
+name: "CD-Analysis-cc7"
+
+on:
+  push:
+    paths:
+      - 'docker/prepare-env/prepare-env-cc-analysis.sh'
+      - 'docker/jupyterhub/**'
+      - 'docker/dask/**'
+      - 'docker/uproot/**'
+      - 'docker/k8s-worker/**'
+      - 'docker/Dockerfile.cc-analysis-centos7'
+    branches:
+      - master
+
+env:
+  GITHUB_SHA: ${{ github.sha }}
+  GITHUB_REF: ${{ github.ref }}
+
+jobs:
+  matrix-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        IMAGE: [cc-analysis-centos7]
+    name: ${{ matrix.IMAGE }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Set Job Environment Variables
+        run: |
+          TAG="${GITHUB_REF##*/}"
+          echo "TAG=${TAG}" >> $GITHUB_ENV
+      - name: Login to Openscience Harbor Registry
+        uses: docker/login-action@v1
+        with:
+          registry: hub.opensciencegrid.org
+          username: ${{ secrets.HARBOR_USER }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
+      - name: Build Container Image
+        run: |
+          cd docker
+          docker build --build-arg TAG="development" -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development  -f Dockerfile.${{ matrix.IMAGE }} .
+      - name: Push to Openscience Harbor Registry
+        run: |
+          docker push hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development
diff --git a/.github/workflows/dockercd-harbor-analysis.yml b/.github/workflows/dockercd-harbor-analysis.yml
@@ -0,0 +1,49 @@
+# Create release only
+name: "CD-Analysis"
+
+on:
+  push:
+    paths:
+      - 'docker/prepare-env/prepare-env-cc-analysis.sh'
+      - 'docker/jupyterhub/**'
+      - 'docker/dask/**'
+      - 'docker/uproot/**'
+      - 'docker/k8s-worker/**'
+      - 'docker/Dockerfile.cc-analysis-ubuntu'
+    branches:
+      - master
+
+env:
+  GITHUB_SHA: ${{ github.sha }}
+  GITHUB_REF: ${{ github.ref }}
+
+jobs:
+  matrix-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        IMAGE: [
+                cc-analysis-ubuntu]
+    name: ${{ matrix.IMAGE }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Set Job Environment Variables
+        run: |
+          TAG="${GITHUB_REF##*/}"
+          echo "TAG=${TAG}" >> $GITHUB_ENV
+      - name: Login to Openscience Harbor Registry
+        uses: docker/login-action@v1
+        with:
+          registry: hub.opensciencegrid.org
+          username: ${{ secrets.HARBOR_USER }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
+      - name: Build Container Image
+        run: |
+          cd docker
+          docker build --build-arg TAG="development" --build-arg HUB="hub.opensciencegrid.org" --build-arg PROJECT="coffea-casa" -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development  -f Dockerfile.${{ matrix.IMAGE }} .
+      - name: Push to Openscience Harbor Registry
+        run: |
+          docker push hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development
diff --git a/.github/workflows/dockercd-harbor-dask.yml → ...lows/dockercd-harbor-base-cc7.yml_disable b/.github/workflows/dockercd-harbor-dask.yml → ...lows/dockercd-harbor-base-cc7.yml_disable
@@ -1,10 +1,14 @@
 # Create release only
-name: Openscience Harbor Registry CD - Dask images
+name: "CD-Base-cc7"
 
 on:
   push:
     paths:
-      - 'docker/**'
+      - 'docker/condor/**'
+      - 'docker/dask/**'
+      - 'docker/jupyterhub/**'
+      - 'docker/prepare-env/prepare-env/prepare-env-cc-base.sh'
+      - 'docker/Dockerfile.cc-base-centos7'
     branches:
       - master
 
@@ -17,10 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IMAGE: [coffea-casa,
-                coffea-casa-analysis,
-                coffea-casa-cc7,
-                coffea-casa-analysis-cc7]
+        IMAGE: [cc-base-centos7]
     name: ${{ matrix.IMAGE }}
     runs-on: ubuntu-latest
 
@@ -39,8 +40,8 @@ jobs:
           password: ${{ secrets.HARBOR_PASSWORD }}
       - name: Build Container Image
         run: |
-          cd docker/${{ matrix.IMAGE }}
-          docker build --build-arg TAG="development" -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development .
+          cd docker
+          docker build --build-arg TAG="development" -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development  -f Dockerfile.${{ matrix.IMAGE }} .
       - name: Push to Openscience Harbor Registry
         run: |
           docker push hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development
diff --git a/.github/workflows/dockercd-harbor-base.yml b/.github/workflows/dockercd-harbor-base.yml
@@ -0,0 +1,47 @@
+# Create release only
+name: "CD-Base"
+
+on:
+  push:
+    paths:
+      - 'docker/condor/**'
+      - 'docker/dask/**'
+      - 'docker/jupyterhub/**'
+      - 'docker/prepare-env/prepare-env/prepare-env-cc-base.sh'
+      - 'docker/Dockerfile.cc-base-ubuntu'
+    branches:
+      - master
+
+env:
+  GITHUB_SHA: ${{ github.sha }}
+  GITHUB_REF: ${{ github.ref }}
+
+jobs:
+  matrix-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        IMAGE: [cc-base-ubuntu]
+    name: ${{ matrix.IMAGE }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Set Job Environment Variables
+        run: |
+          TAG="${GITHUB_REF##*/}"
+          echo "TAG=${TAG}" >> $GITHUB_ENV
+      - name: Login to Openscience Harbor Registry
+        uses: docker/login-action@v1
+        with:
+          registry: hub.opensciencegrid.org
+          username: ${{ secrets.HARBOR_USER }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
+      - name: Build Container Image
+        run: |
+          cd docker
+          docker build --build-arg TAG="development" --build-arg HUB="hub.opensciencegrid.org" --build-arg PROJECT="coffea-casa" -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development  -f Dockerfile.${{ matrix.IMAGE }} .
+      - name: Push to Openscience Harbor Registry
+        run: |
+          docker push hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development
diff --git a/.github/workflows/dockercd-harbor-cc-cc7.yml_disable b/.github/workflows/dockercd-harbor-cc-cc7.yml_disable
@@ -0,0 +1,52 @@
+# Create release only
+name: "CD-CC-cc7"
+
+on:
+  workflow_run:
+    workflows: ["CD-Base-cc7"]
+    branches: [master]
+    types: 
+      - completed
+  push:
+    paths:
+      - 'docker/prepare-env/prepare-env-cc.sh'
+      - 'docker/dask/**'
+      - 'docker/uproot/**'
+      - 'docker/Dockerfile.cc-centos7'
+    branches:
+      - master
+
+env:
+  GITHUB_SHA: ${{ github.sha }}
+  GITHUB_REF: ${{ github.ref }}
+
+jobs:
+  matrix-build:
+    strategy:
+      fail-fast: false
+      matrix:
+         IMAGE: [cc-centos7,
+                ]
+    name: ${{ matrix.IMAGE }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Set Job Environment Variables
+        run: |
+          TAG="${GITHUB_REF##*/}"
+          echo "TAG=${TAG}" >> $GITHUB_ENV
+      - name: Login to Openscience Harbor Registry
+        uses: docker/login-action@v1
+        with:
+          registry: hub.opensciencegrid.org
+          username: ${{ secrets.HARBOR_USER }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
+      - name: Build Container Image
+        run: |
+          cd docker
+          docker build --build-arg TAG="development" -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development  -f Dockerfile.${{ matrix.IMAGE }} .
+      - name: Push to Openscience Harbor Registry
+        run: |
+          docker push hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development
diff --git a/.github/workflows/dockercd-harbor-cc.yml b/.github/workflows/dockercd-harbor-cc.yml
@@ -0,0 +1,53 @@
+# Create release only
+name: "CD-CC"
+
+on:
+  workflow_run:
+    workflows: ["CD-Base"]
+    branches: [master]
+    types: 
+      - completed
+  push:
+    paths:
+      - 'docker/prepare-env/prepare-env-cc.sh'
+      - 'docker/dask/**'
+      - 'docker/uproot/**'
+      - 'docker/Dockerfile.cc-ubuntu'
+    branches:
+      - master
+
+env:
+  GITHUB_SHA: ${{ github.sha }}
+  GITHUB_REF: ${{ github.ref }}
+
+jobs:
+  matrix-build:
+    strategy:
+      fail-fast: false
+      matrix:
+         IMAGE: [
+                cc-ubuntu
+                ]
+    name: ${{ matrix.IMAGE }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Set Job Environment Variables
+        run: |
+          TAG="${GITHUB_REF##*/}"
+          echo "TAG=${TAG}" >> $GITHUB_ENV
+      - name: Login to Openscience Harbor Registry
+        uses: docker/login-action@v1
+        with:
+          registry: hub.opensciencegrid.org
+          username: ${{ secrets.HARBOR_USER }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
+      - name: Build Container Image
+        run: |
+          cd docker
+          docker build --build-arg TAG="development" --build-arg HUB="hub.opensciencegrid.org" --build-arg PROJECT="coffea-casa" -t hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development  -f Dockerfile.${{ matrix.IMAGE }} .
+      - name: Push to Openscience Harbor Registry
+        run: |
+          docker push hub.opensciencegrid.org/coffea-casa/${{ matrix.IMAGE }}:development