Updates to tests for deprecated APIs check

Author: dirgim

Dockerfiles/ci/run_tests.py

@@ -35,5 +35,11 @@ def test_for_report_success_empty_alm_examples(self):
             print(result_output)
             self.assertEqual(result_output["result"], "pass")
 
+
 if __name__ == '__main__':
-    unittest.main()
+    test_name = os.getenv('TEST_NAME', "test_for_report_success_empty_alm_examples")
+    suite = unittest.TestSuite()
+    suite.addTest(RunOperatorTestPlaybookTests(test_name))
+    runner = unittest.TextTestRunner()
+    runner.run(suite)
+

Dockerfiles/midstream/unit_tests.py

@@ -91,7 +91,7 @@ def test_default_negative(self):
                                 cwd=OUTPUT_DIR)
         self.assertEqual(70, result.returncode)
         # check if the .errormessage file generated is empty
-        self.assertTrue(os.stat("/tmp/.errormessage").st_size != 0)
+        self.assertTrue(os.stat(OUTPUT_DIR+".errormessage").st_size != 0)
         # check if the .errormessage exists since its a logger file
         self.assertTrue(os.path.exists(OUTPUT_DIR+".errormessage"))
         message = self.get_error_message_content()
@@ -107,10 +107,26 @@ def test_default_positive(self):
                                 cwd=OUTPUT_DIR)
         self.assertEqual(0, result.returncode)
         # check if the .errormessage file generated is empty
-        self.assertTrue(os.stat("/tmp/.errormessage").st_size == 0)
+        self.assertTrue(os.stat(OUTPUT_DIR+".errormessage").st_size == 0)
         # check if the .errormessage exists since its a logger file
         self.assertTrue(os.path.exists(OUTPUT_DIR+".errormessage"))
 
+    # Run with a test-operator that does not support v4.9 or above which passes the
+    # bundle image validation job
+    def test_default_positive_below_4_9(self):
+        self.env["IMAGE_TO_TEST"] = "quay.io/cvpops/test-operator:test-default-positive-below-4.9-v1"
+        result = subprocess.run(self.exec_cmd,
+                                shell=True,
+                                env=self.env,
+                                cwd=OUTPUT_DIR,
+                                stdout=subprocess.PIPE,
+                                text=True)
+        self.assertEqual(0, result.returncode)
+        # check if the .errormessage file generated is empty
+        self.assertTrue(os.stat(OUTPUT_DIR+".errormessage").st_size == 0)
+        # check if the .errormessage exists since its a logger file
+        self.assertTrue(os.path.exists(OUTPUT_DIR+".errormessage"))
+        self.assertIn(result.stdout, '"support_v4_9": false', "Could not verify that support_v4_9 was set to false")
 
 if __name__ == '__main__':
     unittest.main()

roles/validate_operator_bundle/tasks/main.yml

@@ -59,7 +59,7 @@
 
     - name: "Fail if Pyxis response is not 200"
       fail:
-        msg: "Error collecting OCP version range from Pyxis.  Error message: {{ supported_indices_json.content }}"
+        msg: "Error collecting OCP version range from Pyxis - status {{ supported_indices_json.status }}.  Error message: {{ supported_indices_json.content }}"
       when: supported_indices_json.status != 200
 
     - name: "Convert output to map"
@@ -71,8 +71,8 @@
         msg: "Indices: {{ supported_indices['data'] }}"
 
     - name: "Set support_v4_9 to false if there are no supported versions"
-      set_fact:
-        support_v4_9: false
+      fail:
+        msg: "No supported OCP versions found in Pyxis.  Please verify that the version label '{{ ocp_version_annotation }} 'is valid and includes a currently-supported OCP version"
       when: supported_indices['data']|length==0
 
     - name: "Parse values returned from Pyxis"