Merge pull request #256 from dirgim/ensure-parsed-operator-data

[CVP-2407] Ensure correct data types in parsed_operator_data.yml

Author: dirgim

Dockerfiles/ci/Dockerfile

@@ -8,8 +8,10 @@ RUN export ARCH=$(case $(arch) in x86_64) echo -n amd64 ;; aarch64) echo -n arm6
     chmod a+x /usr/local/bin/operator-sdk && \
     curl -fL -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/2.2.1/yq_linux_amd64 && \
     chmod a+x /usr/local/bin/yq && \
+    curl -fL -o /usr/local/bin/umoci https://github.com/opencontainers/umoci/releases/download/v0.4.5/umoci.amd64 && \
+    chmod a+x /usr/local/bin/umoci && \
     mkdir /project/output && \
-    dnf install --setopt=install_weak_deps=False -y git-core ansible python3-pip mlocate jq && \
+    dnf install --setopt=install_weak_deps=False -y git-core ansible python3-pip mlocate jq skopeo && \
     dnf clean all && \
     pip3 install operator-courier
 ADD ./run_tests.py /run_tests.py

Dockerfiles/ci/run_tests.py

@@ -37,6 +37,38 @@ def test_prepare_metadata_without_alm_annotations_success(self):
             print(result_output)
             self.assertEqual(result_output["result"], "pass")
 
+    def test_extract_operator_bundle_430_channel_success(self):
+        operator_work_dir = "{}/test_extract_operator_bundle_430_channel_success".format(self.test_dir)
+        work_dir = operator_work_dir
+        operator_dir = "{}/test-operator".format(operator_work_dir)
+        operator_bundle_dir = "{}/operator-bundle".format(operator_work_dir)
+        bundle_image = "quay.io/cvpops/test-operator:test-430-channel-positive-v1"
+        exec_cmd = "ansible-playbook -vvv -i localhost, --connection local \
+                    operator-test-playbooks/extract-operator-bundle.yml \
+                    -e 'operator_dir={operator_dir}' \
+                    -e 'bundle_image={bundle_image}' \
+                    -e 'operator_work_dir={operator_work_dir}' \
+                    -e 'operator_bundle_dir={operator_bundle_dir}' \
+                    -e 'work_dir={work_dir}'".format(operator_dir=operator_dir,
+                                                     operator_work_dir=operator_work_dir,
+                                                     operator_bundle_dir=operator_bundle_dir,
+                                                     bundle_image=bundle_image,
+                                                     work_dir=work_dir)
+        playbook_command = subprocess.run(exec_cmd, shell=True)
+
+        print(playbook_command.returncode)
+        self.assertTrue(playbook_command.returncode == 0)
+        self.assertTrue(path.exists("{}/parsed_operator_data.yml".format(work_dir)))
+        with open("{}/parsed_operator_data.yml".format(work_dir), "r") as fd:
+            parsed_output = fd.read()
+            print(parsed_output)
+            self.assertIn('package_name: "e2e-test-operator"', parsed_output)
+            self.assertIn('current_csv: "e2e-test-operator.4.3.1-202002032140"', parsed_output)
+            self.assertIn('current_channel: "4.30"', parsed_output)
+            self.assertIn('is_bundle_image: True', parsed_output)
+            self.assertIn('is_backport: True', parsed_output)
+            self.assertIn('ocp_versions: "v4.5"', parsed_output)
+
     def test_validate_default_operator_bundle_success(self):
         operator_work_dir = "{}/example-bundle-default-positive".format(self.test_dir)
         work_dir = "{}/example-workdir-v45-v49".format(self.test_dir)

roles/parse_operator_bundle/templates/parsed_operator_data.yml.j2

@@ -1,14 +1,14 @@
-package_name: {{ package_name }}
+package_name: "{{ package_name }}"
 is_bundle_image: {{ is_bundle_image }}
 is_backport: {{ is_backport }}
-current_channel: {{ current_channel }}
-default_channel: {{ default_channel }}
-current_csv_dir: {{ current_csv_dir }}
-current_csv: {{ current_csv }}
-csv_path: {{ csv_path }}
-operator_pod_name: {{ operator_pod_name }}
-operator_capabilities: {{ operator_capabilities }}
-operator_container_name: {{ operator_container_name }}
+current_channel: "{{ current_channel }}"
+default_channel: "{{ default_channel }}"
+current_csv_dir: "{{ current_csv_dir }}"
+current_csv: "{{ current_csv }}"
+csv_path: "{{ csv_path }}"
+operator_pod_name: "{{ operator_pod_name }}"
+operator_capabilities: "{{ operator_capabilities }}"
+operator_container_name: "{{ operator_container_name }}"
 operator_allnamespaces_support: {{ operator_allnamespaces_support }}
 operator_ownnamespace_support: {{ operator_ownnamespace_support }}
 operator_singlenamespace_support: {{ operator_singlenamespace_support }}
@@ -21,4 +21,4 @@ crd_paths:
   - {{ crd_path }}
 {% endfor %}
 {% endif %}
-ocp_versions: {{ ocp_versions }}
+ocp_versions: "{{ ocp_versions }}"