From c29cead6382979eecd6e8f78111e6a401d5f53d1 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 25 Nov 2020 19:15:15 +0500
Subject: [PATCH 1/3] Add CI job for checking catalog format

---
 .github/workflows/format_validation.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/format_validation.yml

diff --git a/.github/workflows/format_validation.yml b/.github/workflows/format_validation.yml
new file mode 100644
index 00000000000..7ac6cbd0173
--- /dev/null
+++ b/.github/workflows/format_validation.yml
@@ -0,0 +1,17 @@
+name: format_validation
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    container:
+      image: sonicaj/catalog_validation:latest
+
+    steps:
+    - uses: actions/checkout@v1
+      name: Checkout
+    - name: Validate catalog format
+      run: |
+        /bin/bash -c "PWD=${pwd}; /usr/local/bin/catalog_validate validate --path $PWD"

From f7cb07d77ec5dc0acd46ede56515b838a68e8050 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 25 Nov 2020 19:21:54 +0500
Subject: [PATCH 2/3] Fix format errors

---
 test/ix-chart/2010.0.2/questions.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/ix-chart/2010.0.2/questions.yaml b/test/ix-chart/2010.0.2/questions.yaml
index a7d38295a00..b88b73a1b7b 100644
--- a/test/ix-chart/2010.0.2/questions.yaml
+++ b/test/ix-chart/2010.0.2/questions.yaml
@@ -51,6 +51,7 @@ questions:
   # Image related
   - variable: image
     description: "Docker Image Details"
+    label: "Docker Image"
     group: "Container Images"
     schema:
       type: dict
@@ -101,6 +102,7 @@ questions:
   - variable: restartPolicy
     description: "Restart Policy for workload"
     label: "Restart Policy"
+    group: "Restart Policy"
     schema:
       type: string
       show_if: [["workloadType", "=", "Deployment"]]
@@ -115,6 +117,7 @@ questions:
   - variable: jobRestartPolicy
     description: "Restart Policy for workload"
     label: "Restart Policy"
+    group: "Restart Policy"
     schema:
       type: string
       default: "OnFailure"
@@ -303,6 +306,7 @@ questions:
   - variable: hostPortsList
     label: "Specify host ports for the workload"
     description: "Only use host ports if scaling of a workload is not required"
+    group: "Networking"
     schema:
       show_if: [["updateStrategy", "=", "Recreate"]]
       type: list

From abfccf34a8337dc99bf87af4155522d6e65994ef Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Wed, 25 Nov 2020 19:50:02 +0500
Subject: [PATCH 3/3] Use ixsystems namespace

---
 .github/workflows/format_validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/format_validation.yml b/.github/workflows/format_validation.yml
index 7ac6cbd0173..42b6e07aa9b 100644
--- a/.github/workflows/format_validation.yml
+++ b/.github/workflows/format_validation.yml
@@ -7,7 +7,7 @@ jobs:
 
     runs-on: ubuntu-latest
     container:
-      image: sonicaj/catalog_validation:latest
+      image: ixsystems/catalog_validation:latest
 
     steps:
     - uses: actions/checkout@v1