fix: add skipamtcertcheck flag for AMT19+ activation support (#3195)

Author: lim-chris

cypress/e2e/integration/rpc/cloud.activation.spec.ts

@@ -29,17 +29,17 @@ if (Cypress.env('ISOLATE').charAt(0).toLowerCase() !== 'y') {
 
     // Default: use Docker (Linux/Mac); Windows overrides below use rpc.exe directly
     let infoCommand = `docker run --rm --network host --device=/dev/mei0 ${rpcDockerImage} amtinfo --json`
-    let activateCommand = `docker run --rm --network host --device=/dev/mei0 ${rpcDockerImage} activate -u wss://${fqdn}/activate -v -n --profile ${profileName} --json`
-    let deactivateCommand = `docker run --rm --network host --device=/dev/mei0 ${rpcDockerImage} deactivate -u wss://${fqdn}/activate -v -n -f --json --password ${password}`
+    let activateCommand = `docker run --rm --network host --device=/dev/mei0 ${rpcDockerImage} activate -u wss://${fqdn}/activate -v -n -skipamtcertcheck --profile ${profileName} --json`
+    let deactivateCommand = `docker run --rm --network host --device=/dev/mei0 ${rpcDockerImage} deactivate -u wss://${fqdn}/activate -v -n -skipamtcertcheck -f --json --password ${password}`
 
     if (isWin) {
-      activateCommand = `rpc.exe activate -u wss://${fqdn}/activate -v -n --profile ${profileName} --json`
+      activateCommand = `rpc.exe activate -u wss://${fqdn}/activate -v -n -skipamtcertcheck --profile ${profileName} --json`
       infoCommand = 'rpc.exe amtinfo --json'
-      deactivateCommand = `rpc.exe deactivate -u wss://${fqdn}/activate -v -n -f --json --password ${password}`
+      deactivateCommand = `rpc.exe deactivate -u wss://${fqdn}/activate -v -n -skipamtcertcheck -f --json --password ${password}`
     }
 
     describe('Device Activation - Cloud', () => {
-      context('TC_DEVICE_ACTIVATE_AND_DEACTIVATE', () => {
+      context('TC_ACTIVATION_DEVICE_ACTIVATE_AND_DEACTIVATE', () => {
         beforeEach(() => {
           cy.setup()
           cy.exec(infoCommand, execConfig).then((result) => {
@@ -69,9 +69,9 @@ if (Cypress.env('ISOLATE').charAt(0).toLowerCase() !== 'y') {
             }
 
             if (isAdminControlModeProfile) {
-              expect(combined).to.contain('Status: Admin control mode')
+              expect(combined).to.match(/Status: admin control mode/i)
             } else {
-              expect(combined).to.contain('Status: Client control mode')
+              expect(combined).to.match(/Status: client control mode/i)
             }
 
             if (parts[2] === 'CIRA') {
@@ -156,6 +156,7 @@ if (Cypress.env('ISOLATE').charAt(0).toLowerCase() !== 'y') {
               const { combined } = buildOutput(result)
               cy.log(combined)
               expect(combined).to.contain('Status: Deactivated')
+              cy.wait(10000)
             })
           }
         })

cypress/e2e/integration/rpc/console.activation.spec.ts

@@ -34,17 +34,17 @@ if (Cypress.env('ISOLATE').charAt(0).toLowerCase() !== 'y') {
 
     // Default: use Docker (Linux/Mac); Windows overrides below use rpc.exe directly
     let infoCommand = `docker run --rm --network host --device=/dev/mei0 -v ${profileDir}:/config ${rpcDockerImage} amtinfo -json`
-    let activateCommand = `docker run --rm --network host --device=/dev/mei0 -v ${profileDir}:/config ${rpcDockerImage} activate -local -configv2 /config/${profileFileName} -configencryptionkey ${encryptionKey} -skipamtcertcheck -v -n -json`
-    let deactivateCommand = `docker run --rm --network host --device=/dev/mei0 -v ${profileDir}:/config ${rpcDockerImage} deactivate -local -v -n -f -json -password ${password}`
+    let activateCommand = `docker run --rm --network host --device=/dev/mei0 -v ${profileDir}:/config ${rpcDockerImage} activate -local -configv2 /config/${profileFileName} -configencryptionkey ${encryptionKey} -v -skipamtcertcheck -json`
+    let deactivateCommand = `docker run --rm --network host --device=/dev/mei0 -v ${profileDir}:/config ${rpcDockerImage} deactivate -local -v -skipamtcertcheck -f -json -password ${password}`
 
     if (isWin) {
-      activateCommand = `rpc.exe activate -local -configv2 ${profileYamlFile} -configencryptionkey ${encryptionKey} -skipamtcertcheck -v -n -json`
+      activateCommand = `rpc.exe activate -local -configv2 ${profileYamlFile} -configencryptionkey ${encryptionKey} -v -skipamtcertcheck -json`
       infoCommand = 'rpc.exe amtinfo -json'
-      deactivateCommand = `rpc.exe deactivate -local -v -n -f -json -password ${password}`
+      deactivateCommand = `rpc.exe deactivate -local -v -skipamtcertcheck -f -json -password ${password}`
     }
 
     describe('Device Activation - Console', () => {
-      context('TC_DEVICE_ACTIVATE_AND_DEACTIVATE', () => {
+      context('TC_ACTIVATION_DEVICE_ACTIVATE_AND_DEACTIVATE', () => {
         beforeEach(() => {
           cy.setup()
           cy.exec(infoCommand, execConfig).then((result) => {