build: use switch_to.sh for config generation

Author: jgriffiths

gitlab/dev_fw.yml

@@ -4,23 +4,33 @@
 .build_dev_template:
   extends: .build_template
   stage: build_dev
-  before_script:
-    - cp configs/sdkconfig_dev$(echo $CI_JOB_NAME | sed "s/^${CI_JOB_STAGE}//").defaults sdkconfig.defaults
 
 build_dev_jade:
   extends: .build_dev_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade --dev
 
-build_dev_jade_v1_1:
+build_dev_jade_noradio:
   extends: .build_dev_template
+  before_script:
+    -  . $HOME/esp/esp-idf/export.sh &&./tools/switch_to.sh jade --dev --noradio
 
-build_dev_jade_v2:
+build_dev_jade_v1_1:
   extends: .build_dev_template
+  before_script:
+    -  . $HOME/esp/esp-idf/export.sh &&./tools/switch_to.sh jade_v1_1 --dev
 
-build_dev_jade_noradio:
+build_dev_jade_v1_1_noradio:
   extends: .build_dev_template
+  before_script:
+    -  . $HOME/esp/esp-idf/export.sh &&./tools/switch_to.sh jade_v1_1 --dev --noradio
 
-build_dev_jade_v1_1_noradio:
+build_dev_jade_v2:
   extends: .build_dev_template
+  before_script:
+    -  . $HOME/esp/esp-idf/export.sh &&./tools/switch_to.sh jade_v2 --dev
 
 build_dev_jade_v2_noradio:
   extends: .build_dev_template
+  before_script:
+    -  . $HOME/esp/esp-idf/export.sh &&./tools/switch_to.sh jade_v2 --dev --noradio

gitlab/prod_fw.yml

@@ -4,23 +4,33 @@
 .build_prod_template:
   extends: .build_template
   stage: build_prod
-  before_script:
-    - cp production/sdkconfig$(echo $CI_JOB_NAME | sed "s/^${CI_JOB_STAGE}//")_prod.defaults sdkconfig.defaults
 
 build_prod_jade:
   extends: .build_prod_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade
 
 build_prod_jade_noradio:
   extends: .build_prod_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade --noradio
 
 build_prod_jade_v1_1:
   extends: .build_prod_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade_v1_1
 
 build_prod_jade_v1_1_noradio:
   extends: .build_prod_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade_v1_1 --noradio
 
 build_prod_jade_v2:
   extends: .build_prod_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade_v2
 
 build_prod_jade_v2_noradio:
   extends: .build_prod_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade_v2 --noradio

gitlab/test_fw.yml

@@ -12,37 +12,54 @@
   stage: build_test
   artifacts:
     expire_in: 2 days
-  before_script:
-    # Create CI config from the default developer device config
-    - echo $CI_JOB_NAME | sed "s/^${CI_JOB_STAGE}//" | sed "s/_ci$//" >device_name
-    - cp configs/sdkconfig$(cat device_name).defaults sdkconfig.defaults
-    - echo "CONFIG_DEBUG_UNATTENDED_CI=y" >>sdkconfig.defaults
-    - echo "CONFIG_HEAP_POISONING_COMPREHENSIVE=y" >>sdkconfig.defaults
-    - echo "CONFIG_LOG_DEFAULT_LEVEL_NONE=y" >>sdkconfig.defaults
 
-build_test_qemu:
-  extends: .build_test_template
-
-build_test_qemu_psram:
+build_test_jade_ci:
   extends: .build_test_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade --dev --debug --ci --log
 
-build_test_qemu_psram_unamalgamated:
+build_test_jade_noradio_ci:
   extends: .build_test_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade --dev --debug --ci --log --noradio
 
-build_test_jade_ci:
+build_test_jade_v1_1_ci:
   extends: .build_test_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade_v1_1 --dev --debug --ci --log
 
-build_test_jade_v1_1_ci:
+build_test_jade_v1_1_noradio_ci:
   extends: .build_test_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade_v1_1 --dev --debug --ci --log --noradio
 
 build_test_jade_v2_ci:
   extends: .build_test_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade_v2 --dev --debug --ci --log --jtag
 
-build_test_jade_noradio_ci:
+build_test_jade_v2_noradio_ci:
   extends: .build_test_template
+  before_script:
+    - . $HOME/esp/esp-idf/export.sh && ./tools/switch_to.sh jade_v2 --dev --debug --ci --log --jtag --noradio
 
-build_test_jade_v1_1_noradio_ci:
-  extends: .build_test_template
 
-build_test_jade_v2_noradio_ci:
+.build_test_qemu_template:
   extends: .build_test_template
+  before_script:
+    # Create CI config from the default developer device config
+    # TODO: Add qemu to tools/switch_to.sh
+    - echo $CI_JOB_NAME | sed "s/^${CI_JOB_STAGE}//" | sed "s/_ci$//" >device_name
+    - cp configs/sdkconfig$(cat device_name).defaults sdkconfig.defaults
+    - echo "CONFIG_DEBUG_UNATTENDED_CI=y" >>sdkconfig.defaults
+    - echo "CONFIG_HEAP_POISONING_COMPREHENSIVE=y" >>sdkconfig.defaults
+    - echo "CONFIG_LOG_DEFAULT_LEVEL_NONE=y" >>sdkconfig.defaults
+
+build_test_qemu:
+  extends: .build_test_qemu_template
+
+build_test_qemu_psram:
+  extends: .build_test_qemu_template
+
+build_test_qemu_psram_unamalgamated:
+  extends: .build_test_qemu_template

gitlab/test_libjade.yml

@@ -2,7 +2,7 @@
   tags: [ ga ]
   before_script:
     - . $HOME/esp/esp-idf/export.sh
-    - ./tools/switch_to.sh jadedev --noradio
+    - ./tools/switch_to.sh jade --dev --noradio
     - source /venv/bin/activate
     - pip install -r requirements.txt
     - pip install -r pinserver/requirements.txt