From d9d0e669ca9396266c41eb3351246818a8916a37 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 22 Nov 2022 17:47:40 +0500 Subject: [PATCH 1/5] Add script to generate catalog information --- update_catalog_detail.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100755 update_catalog_detail.py diff --git a/update_catalog_detail.py b/update_catalog_detail.py new file mode 100755 index 0000000000..790cb93749 --- /dev/null +++ b/update_catalog_detail.py @@ -0,0 +1,20 @@ +#!/usr/bin/python3 +import json +import os + +from catalog_validation.items.catalog import get_items_in_trains, retrieve_train_names, retrieve_trains_data + + +def get_trains() -> dict: + location: str = os.getcwd() + preferred_trains: list = [] + + trains_to_traverse = retrieve_train_names(location) + items = get_items_in_trains(trains_to_traverse, location) + + return retrieve_trains_data(items, location, preferred_trains, trains_to_traverse)[0] + + +if __name__ == '__main__': + with open('catalog.json', 'w') as f: + f.write(json.dumps(get_trains(), indent=4)) From 90667cf8f57d55f0f78df57c760ad9c916438d18 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 22 Nov 2022 17:50:41 +0500 Subject: [PATCH 2/5] Add github workflow for updating catalog information --- .github/workflows/update_catalog.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/update_catalog.yaml diff --git a/.github/workflows/update_catalog.yaml b/.github/workflows/update_catalog.yaml new file mode 100644 index 0000000000..8fa49f60df --- /dev/null +++ b/.github/workflows/update_catalog.yaml @@ -0,0 +1,22 @@ +name: catalog_validation + +on: + push: + branches: + - 'master' + +jobs: + validate: + runs-on: ubuntu-latest + + container: + image: truenas/catalog_validation:latest + + steps: + - uses: actions/checkout@v2 + - name: Update catalog details + run: ./update_catalog_detail.py + - uses: stefanzweifel/git-auto-commit-action@v4 + with: + commit_message: Update catalog information + file_pattern: 'catalog.json' From 391b196ab21f50e5d092a8f8b38477828a3749e1 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Tue, 22 Nov 2022 18:53:57 +0500 Subject: [PATCH 3/5] Update docker image tag --- .github/workflows/update_catalog.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update_catalog.yaml b/.github/workflows/update_catalog.yaml index 8fa49f60df..6addb8f589 100644 --- a/.github/workflows/update_catalog.yaml +++ b/.github/workflows/update_catalog.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest container: - image: truenas/catalog_validation:latest + image: ixsystems/catalog_validation:latest steps: - uses: actions/checkout@v2 @@ -20,3 +20,6 @@ jobs: with: commit_message: Update catalog information file_pattern: 'catalog.json' + commit_user_name: sonicaj + commit_user_email: waqarsonic1@gmail.com + commit_author: sonicaj From d9bc7d9b9f1d57af6c03a0db41d22bbe2738afc4 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Wed, 23 Nov 2022 12:11:44 +0500 Subject: [PATCH 4/5] Remove update catalog script --- update_catalog_detail.py | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100755 update_catalog_detail.py diff --git a/update_catalog_detail.py b/update_catalog_detail.py deleted file mode 100755 index 790cb93749..0000000000 --- a/update_catalog_detail.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/python3 -import json -import os - -from catalog_validation.items.catalog import get_items_in_trains, retrieve_train_names, retrieve_trains_data - - -def get_trains() -> dict: - location: str = os.getcwd() - preferred_trains: list = [] - - trains_to_traverse = retrieve_train_names(location) - items = get_items_in_trains(trains_to_traverse, location) - - return retrieve_trains_data(items, location, preferred_trains, trains_to_traverse)[0] - - -if __name__ == '__main__': - with open('catalog.json', 'w') as f: - f.write(json.dumps(get_trains(), indent=4)) From f69a76035f07461ff9e9fee1943cb8c7e2b97324 Mon Sep 17 00:00:00 2001 From: sonicaj Date: Wed, 23 Nov 2022 12:14:19 +0500 Subject: [PATCH 5/5] Use catalog validation docker image to update catalog data --- .github/workflows/update_catalog.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/update_catalog.yaml b/.github/workflows/update_catalog.yaml index 6addb8f589..6d2c3f5c36 100644 --- a/.github/workflows/update_catalog.yaml +++ b/.github/workflows/update_catalog.yaml @@ -15,7 +15,8 @@ jobs: steps: - uses: actions/checkout@v2 - name: Update catalog details - run: ./update_catalog_detail.py + run: | + /bin/bash -c "PWD=${pwd}; /usr/local/bin/catalog_update update --path $PWD" - uses: stefanzweifel/git-auto-commit-action@v4 with: commit_message: Update catalog information