From ce201fc229a287d9c8ebae9973b3eb97432aa9b8 Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 22 Aug 2024 09:29:19 +1000 Subject: [PATCH 1/4] config/ci.json: Added global default `payu-version` `1.1.4` --- config/ci.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/ci.json b/config/ci.json index 963305d..ba62726 100644 --- a/config/ci.json +++ b/config/ci.json @@ -1,5 +1,5 @@ { - "$schema": "https://github.com/ACCESS-NRI/schema/tree/main/au.org.access-nri/model/configuration/ci/1-0-0.json", + "$schema": "https://github.com/ACCESS-NRI/schema/tree/main/au.org.access-nri/model/configuration/ci/2-0-0.json", "scheduled": { "default": { "markers": "checksum" @@ -17,6 +17,7 @@ }, "default": { "model-config-tests-version": "0.0.7", - "python-version": "3.11.0" + "python-version": "3.11.0", + "payu-version": "1.1.4" } } \ No newline at end of file From 5ca7105bd20bd5a856685640a7f2d2d5c0c6597f Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 22 Aug 2024 13:36:06 +1000 Subject: [PATCH 2/4] generate-initial-checksums.yml: Replaced `python-version` with `payu-version` --- .github/workflows/generate-initial-checksums.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/generate-initial-checksums.yml b/.github/workflows/generate-initial-checksums.yml index 2b2a83b..c879d28 100644 --- a/.github/workflows/generate-initial-checksums.yml +++ b/.github/workflows/generate-initial-checksums.yml @@ -25,7 +25,7 @@ jobs: if: github.repository != 'ACCESS-NRI/model-configs-template' runs-on: ubuntu-latest outputs: - python-version: ${{ steps.repro-config.outputs.python-version }} + payu-version: ${{ steps.repro-config.outputs.payu-version }} model-config-tests-version: ${{ steps.repro-config.outputs.model-config-tests-version }} steps: - name: Checkout main @@ -57,7 +57,7 @@ jobs: steps: - run: | echo '::notice::This deployment is using the following inputs: `config-branch-name`=`${{ inputs.config-branch-name }}`, `commit-checksums`=`${{ inputs.commit-checksums }}`, `committed-checksum-location`=`${{ inputs.committed-checksum-location }}`,`committed-checksum-tag-version`=`${{ inputs.committed-checksum-tag-version }}`.' - echo '::notice::This deployment is using Python Version ${{ needs.config.outputs.python-version }} and Model Config Tests Version ${{ needs.config.outputs.model-config-tests-version }}' + echo '::notice::This deployment is using Payu Version ${{ needs.config.outputs.payu-version }} and Model Config Tests Version ${{ needs.config.outputs.model-config-tests-version }}' generate-checksums: name: Generate Checksums @@ -72,7 +72,7 @@ jobs: committed-checksum-tag: "${{ inputs.config-branch-name }}-${{ inputs.committed-checksum-tag-version }}" environment-name: "Gadi Initial Checksum" model-config-tests-version: ${{ needs.config.outputs.model-config-tests-version }} - python-version: ${{ needs.config.outputs.python-version }} + payu-version: ${{ needs.config.outputs.payu-version }} permissions: contents: write secrets: inherit From a6ac992227347a620e9227a389fa56626f9ac0dd Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 22 Aug 2024 13:39:36 +1000 Subject: [PATCH 3/4] README-DEV.md: Usage of `payu-version` --- README-DEV.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README-DEV.md b/README-DEV.md index e06ccc4..41f6d4d 100644 --- a/README-DEV.md +++ b/README-DEV.md @@ -30,13 +30,13 @@ This is the `config/ci.json` configuration file for specifying different test ma - `reproducibility`: Reproducibility tests that are run as part of pull requests. The keys under these tests represent the target branches into which pull requests are being merged. - `qa` - Quick quality assurance tests that are run as part of pull requests. The keys under these tests represent the target branches into which pull requests are being merged. -The configuration properties needed to run the tests are: +The configuration properties needed to run the tests are | Name | Type | Description | Example | | ---- | ---- | ----------- | -------- | | markers | `string` | Markers used for the pytest checks, in the python format | `checksum` | | model-config-tests-version | `string` | The version of the model-config-tests | `0.0.1` | -| python-version | `string` | The python version used to create test virtual environment | `3.11.0` | +| payu-version | `string` | The Payu version used to create test virtual environment | `1.1.4` | As most of the tests use the same test and python versions, and similar markers, there are two levels of defaults. There's a default at test type level which is useful for defining test markers - this selects certain pytests to run in `model-config-tests`. There is an outer global default, which is used if a property is not defined for a given branch/tag, and it is not defined for the test default. The `parse-ci-config` action applies the fall-back default logic. For more information on using this action see [`ACCESS-NRI/model-config-tests`](https://github.com/ACCESS-NRI/model-config-tests/). From 406b4f65e94769600d98f391afa58703b54ca3fe Mon Sep 17 00:00:00 2001 From: Tommy Gatti Date: Thu, 22 Aug 2024 15:03:03 +1000 Subject: [PATCH 4/4] Update README-DEV.md Co-authored-by: jo-basevi --- README-DEV.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README-DEV.md b/README-DEV.md index 41f6d4d..8fff1a3 100644 --- a/README-DEV.md +++ b/README-DEV.md @@ -36,7 +36,8 @@ The configuration properties needed to run the tests are | ---- | ---- | ----------- | -------- | | markers | `string` | Markers used for the pytest checks, in the python format | `checksum` | | model-config-tests-version | `string` | The version of the model-config-tests | `0.0.1` | -| payu-version | `string` | The Payu version used to create test virtual environment | `1.1.4` | +| python-version | `string` | The python version used to create test virtual environment on Github hosted tests | `3.11.0` | +| payu-version | `string` | The Payu version used to run the model | `1.1.4` | As most of the tests use the same test and python versions, and similar markers, there are two levels of defaults. There's a default at test type level which is useful for defining test markers - this selects certain pytests to run in `model-config-tests`. There is an outer global default, which is used if a property is not defined for a given branch/tag, and it is not defined for the test default. The `parse-ci-config` action applies the fall-back default logic. For more information on using this action see [`ACCESS-NRI/model-config-tests`](https://github.com/ACCESS-NRI/model-config-tests/).