From 1036f7cb695f06b995f2266314002bffddd8111a Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Mon, 30 Dec 2024 09:54:33 -0500 Subject: [PATCH 1/3] Update webmo to use Pitzer --- charts-private/webmo/Chart.yaml | 2 +- charts-private/webmo/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts-private/webmo/Chart.yaml b/charts-private/webmo/Chart.yaml index 03938c11..a1e4c394 100644 --- a/charts-private/webmo/Chart.yaml +++ b/charts-private/webmo/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: webmo description: OSC webmo web service type: application -version: 0.7.1 +version: 0.8.0 appVersion: '23.1' maintainers: - name: treydock diff --git a/charts-private/webmo/values.yaml b/charts-private/webmo/values.yaml index b7a280e1..aa06997d 100644 --- a/charts-private/webmo/values.yaml +++ b/charts-private/webmo/values.yaml @@ -45,7 +45,7 @@ webservice: repository: docker-registry.osc.edu/webservices/webmo env: - name: SLURM_CONF - value: '/etc/slurm/slurm-owens.conf' + value: '/etc/slurm/slurm-pitzer.conf' - name: WEBMO_INSTALL value: /users/PZS0605/webmo/k8s_webmo/deployments/{{ include "osc.common.environment" . }}/install mounts: From 055e84b5ade28fbf7a44b5e8ee7c4a38c319d7a9 Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Mon, 30 Dec 2024 10:27:29 -0500 Subject: [PATCH 2/3] Increate timeout --- .github/config/cf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/config/cf.yaml b/.github/config/cf.yaml index da31874a..7101a8d1 100644 --- a/.github/config/cf.yaml +++ b/.github/config/cf.yaml @@ -8,3 +8,4 @@ chart-repos: - bitnami=https://charts.bitnami.com/bitnami - osc=https://osc.github.io/osc-helm-charts/ - robjuz-helm-charts=https://treydock.github.io/robjuz-helm-charts/ +helm-extra-args: '--timeout 600s' From 82f1359ad6626414ad606b72b6740f880b8a1aef Mon Sep 17 00:00:00 2001 From: Trey Dockendorf Date: Mon, 30 Dec 2024 13:39:51 -0500 Subject: [PATCH 3/3] Update chart-testing-action to fix timeout issue --- .github/workflows/test-private.yaml | 4 ++-- .github/workflows/test.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-private.yaml b/.github/workflows/test-private.yaml index 4497450e..cb7c29bd 100644 --- a/.github/workflows/test-private.yaml +++ b/.github/workflows/test-private.yaml @@ -23,7 +23,7 @@ jobs: with: python-version: 3.9 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (lint) run: ct lint --config .github/config/cf.yaml --chart-dirs charts-private @@ -55,7 +55,7 @@ jobs: with: version: v3.12.0 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.0 + uses: helm/chart-testing-action@v2.6.1 - name: Create kind cluster uses: helm/kind-action@v1.4.0 with: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e01555c5..56d8dbc7 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -32,7 +32,7 @@ jobs: with: python-version: 3.9 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.0 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (lint) run: ct lint --config .github/config/cf.yaml --chart-dirs charts @@ -64,7 +64,7 @@ jobs: with: python-version: 3.9 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.6.0 + uses: helm/chart-testing-action@v2.6.1 - name: Create kind cluster uses: helm/kind-action@v1.4.0 with: