Sfoglia il codice sorgente

Merge branch 'bugfix/ci_flasher_args_json_dict_items' into 'master'

ci: fix flasher_args.json parser (iterate over dictionary)

Closes IDFCI-347

See merge request espressif/esp-idf!11787
Anton Maklakov 5 anni fa
parent
commit
286f06b274

+ 1 - 1
components/esptool_py/esptool

@@ -1 +1 @@
-Subproject commit 4fa0bd7b0d1f69f5ff22b043adc07c5e562a8931
+Subproject commit 8270199920415049eea65990a1ca93a549113979

+ 3 - 3
tools/ci/python_packages/ttfw_idf/IDFApp.py

@@ -32,7 +32,7 @@ except ImportError:
 
 def parse_encrypted_flag(args, offs, binary):
     # Find partition entries (e.g. the entries with an offset and a file)
-    for _, entry in args:
+    for _, entry in args.items():
         # If the current entry is a partition, we have to check whether it is
         # the one we are looking for or not
         try:
@@ -329,7 +329,7 @@ class IDFApp(App.BaseApp):
 
         (Called from constructor)
 
-        Returns (flash_files, flash_settings)
+        Returns (flash_files, encrypt_files, flash_settings)
         """
 
         if self.IDF_FLASH_ARGS_FILE in os.listdir(self.binary_path):
@@ -352,7 +352,7 @@ class IDFApp(App.BaseApp):
         # All files must be encrypted is both file lists are the same
         flash_settings["encrypt"] = sorted(flash_files) == sorted(encrypt_files)
 
-        return self._int_offs_abs_paths(flash_files), self._int_offs_abs_paths(encrypt_files), self.flash_settings
+        return self._int_offs_abs_paths(flash_files), self._int_offs_abs_paths(encrypt_files), flash_settings
 
     def _parse_partition_table(self):
         """

+ 1 - 0
tools/ci/python_packages/ttfw_idf/IDFDUT.py

@@ -279,6 +279,7 @@ class IDFDUT(DUT.SerialDUT):
                 'compress': True,
                 'verify': False,
                 'encrypt': encrypt,
+                'ignore_flash_encryption_efuse_setting': False,
                 'erase_all': False,
             })