From 0047d5022d5dca09e1dee260fffa59b2d7f0531a Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Fri, 17 Jun 2022 10:26:54 +0100 Subject: [PATCH 1/3] disable bumping of pangeo images as per: https://github.com/2i2c-org/infrastructure/issues/1240#issuecomment-1151212986 --- .github/workflows/bump-image-tags.yaml | 30 ++++++++++++++------------ 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/bump-image-tags.yaml b/.github/workflows/bump-image-tags.yaml index d403d472eb..cadecad962 100644 --- a/.github/workflows/bump-image-tags.yaml +++ b/.github/workflows/bump-image-tags.yaml @@ -18,20 +18,22 @@ jobs: include: # For each new config_path to monitor, add a new item in this matrix. # The Action can read multiple paths to images, but not multiple config files. - - name: "pangeo-hubs common singleuser image" - config_path: "config/clusters/pangeo-hubs/common.values.yaml" - # The regexpr attribute will ensure we only bump tags in the form YYYY.MM.DD - images_info: '[{"values_path": ".basehub.jupyterhub.singleuser.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}]' - - name: "m2lines common singleuser/PyTorch/Tensorflow" - config_path: "config/clusters/m2lines/common.values.yaml" - # The regexpr attribute will ensure we only bump tags in the form YYYY.MM.DD - # If the ordering of profileList changes, update the index in this expression - images_info: '[{"values_path": ".basehub.jupyterhub.singleuser.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}, {"values_path": ".basehub.jupyterhub.singleuser.profileList[4].kubespawner_override.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}, {"values_path": ".basehub.jupyterhub.singleuser.profileList[5].kubespawner_override.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}]' - - name: "leap common singleuser/pangeo-ml-notebook" - config_path: "config/clusters/leap/common.values.yaml" - # The regexpr attribute will ensure we only bump tags in the form YYYY.MM.DD - # If the ordering of profileList changes, update the index in this expression - images_info: '[{"values_path": ".basehub.jupyterhub.singleuser.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}, {"values_path": ".basehub.jupyterhub.singleuser.profileList[4].kubespawner_override.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}]' + + # Turn of bumping of Pangeo images as per https://github.com/2i2c-org/infrastructure/issues/1240#issuecomment-1151212986 + # - name: "pangeo-hubs common singleuser image" + # config_path: "config/clusters/pangeo-hubs/common.values.yaml" + # # The regexpr attribute will ensure we only bump tags in the form YYYY.MM.DD + # images_info: '[{"values_path": ".basehub.jupyterhub.singleuser.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}]' + # - name: "m2lines common singleuser/PyTorch/Tensorflow" + # config_path: "config/clusters/m2lines/common.values.yaml" + # # The regexpr attribute will ensure we only bump tags in the form YYYY.MM.DD + # # If the ordering of profileList changes, update the index in this expression + # images_info: '[{"values_path": ".basehub.jupyterhub.singleuser.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}, {"values_path": ".basehub.jupyterhub.singleuser.profileList[4].kubespawner_override.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}, {"values_path": ".basehub.jupyterhub.singleuser.profileList[5].kubespawner_override.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}]' + # - name: "leap common singleuser/pangeo-ml-notebook" + # config_path: "config/clusters/leap/common.values.yaml" + # # The regexpr attribute will ensure we only bump tags in the form YYYY.MM.DD + # # If the ordering of profileList changes, update the index in this expression + # images_info: '[{"values_path": ".basehub.jupyterhub.singleuser.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}, {"values_path": ".basehub.jupyterhub.singleuser.profileList[4].kubespawner_override.image", "regexpr": "[0-9]{4}.[0-9]{2}.[0-9]{2}"}]' steps: # We want tests to be run on the Pull Request that gets opened by the next step, From 4ad3f4bfff8e1b6cc92e14efe68dbf40b27ebf19 Mon Sep 17 00:00:00 2001 From: Sarah Gibson Date: Fri, 17 Jun 2022 10:29:15 +0100 Subject: [PATCH 2/3] Enable bumps of repo2docker in the BinderHub helm chart --- .github/workflows/bump-image-tags.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bump-image-tags.yaml b/.github/workflows/bump-image-tags.yaml index cadecad962..7ad6dfcb08 100644 --- a/.github/workflows/bump-image-tags.yaml +++ b/.github/workflows/bump-image-tags.yaml @@ -2,8 +2,8 @@ name: Bump Image Tags on: workflow_dispatch: - # schedule: - # - cron: "0 0 * * 1" # Run at 00:00 UTC every Monday + schedule: + - cron: "0 0 * * 1" # Run at 00:00 UTC every Monday env: team_reviewers: tech-team @@ -18,6 +18,9 @@ jobs: include: # For each new config_path to monitor, add a new item in this matrix. # The Action can read multiple paths to images, but not multiple config files. + - name: "BinderHub/repo2docker bump" + config_path: "helm-charts/binderhub/values.yaml" + images_info: '{"values_path": ".binderhub.config.BinderHub.build_image"}' # Turn of bumping of Pangeo images as per https://github.com/2i2c-org/infrastructure/issues/1240#issuecomment-1151212986 # - name: "pangeo-hubs common singleuser image" From 8f131204830bd36ef657f51174e998335b9cd92f Mon Sep 17 00:00:00 2001 From: Sarah Gibson <44771837+sgibson91@users.noreply.github.com> Date: Fri, 17 Jun 2022 10:31:44 +0100 Subject: [PATCH 3/3] fix typo --- .github/workflows/bump-image-tags.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bump-image-tags.yaml b/.github/workflows/bump-image-tags.yaml index 7ad6dfcb08..70830673d6 100644 --- a/.github/workflows/bump-image-tags.yaml +++ b/.github/workflows/bump-image-tags.yaml @@ -22,7 +22,7 @@ jobs: config_path: "helm-charts/binderhub/values.yaml" images_info: '{"values_path": ".binderhub.config.BinderHub.build_image"}' - # Turn of bumping of Pangeo images as per https://github.com/2i2c-org/infrastructure/issues/1240#issuecomment-1151212986 + # Turn off bumping of Pangeo images as per https://github.com/2i2c-org/infrastructure/issues/1240#issuecomment-1151212986 # - name: "pangeo-hubs common singleuser image" # config_path: "config/clusters/pangeo-hubs/common.values.yaml" # # The regexpr attribute will ensure we only bump tags in the form YYYY.MM.DD