[TCT][Scripts][NonACR][Support added in scripts for tizen 8.0 version as 7.5 is depre... 20/292820/2
authorShobhit Verma <shobhit.v@samsung.com>
Mon, 15 May 2023 08:33:16 +0000 (14:03 +0530)
committerShobhit Verma <shobhit.v@samsung.com>
Mon, 15 May 2023 08:39:51 +0000 (14:09 +0530)
Change-Id: Ib0890306c6ab76ad28685c4b4c8718ee6eb0dafb
Signed-off-by: Shobhit Verma <shobhit.v@samsung.com>
scripts_tpk/child-package-generator.sh
scripts_tpk/tcpackageslistsgen.py
scripts_tpk/tpk-install.py
scripts_tpk/tpksdk-install.py
tool/NativeTCT_7.5.tar.gz [deleted file]
tool/NativeTCT_8.0.tar.gz [new file with mode: 0644]

index ea46298fd842e626530dde96b7dbf679379e6045..3a8de4bceda26bbfe89efcf02f60e3071bcd95bc 100755 (executable)
@@ -13,9 +13,9 @@ if [ $BUILD_TC_TYPE = "utc" ]; then
         PREFIX="core"
 fi
 
-TIZEN____="tizen_native_7.5"
+TIZEN____="tizen_native_8.0"
 TCT_PKG="tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME"
-TCT_PKG_NAME="tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME-7.5.zip"
+TCT_PKG_NAME="tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME-8.0.zip"
 ZIP_PKG_DIR="/opt/tct/$TIZEN____/packages/$BUILD_DEVICE_TYPE"
 PKG_INFO="_pkg_info.xml"
 PKG_INFO_FILE_LOC="/opt/tct/$TIZEN____/packages/pkg_infos/$BUILD_DEVICE_TYPE$PKG_INFO"
@@ -147,7 +147,7 @@ do
                        PKG_INFO_2="    <auto_tcn>$tc_count</auto_tcn>"
                        PKG_INFO_3="    <manual_tcn>0</manual_tcn>"
                        PKG_INFO_4="    <total_tcn>$tc_count</total_tcn>"
-                       PKG_INFO_5="    <pkg_name>$BUILD_DEVICE_TYPE/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME$DELIMIT$CURRENT_LOOP_COUNT-7.5.zip</pkg_name>"
+                       PKG_INFO_5="    <pkg_name>$BUILD_DEVICE_TYPE/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME$DELIMIT$CURRENT_LOOP_COUNT-8.0.zip</pkg_name>"
                        PKG_INFO_6="  </suite>"
                        echo $PKG_INFO_1 >> $PKG_INFO_FILE\_NEW
                        echo $PKG_INFO_2 >> $PKG_INFO_FILE\_NEW
@@ -180,8 +180,8 @@ do
        rm ./opt/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT/tests.xml
        cp ../../$TEST_XML_FILE\_$CURRENT_LOOP_COUNT ./opt/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT/$TEST_XML_FILE
 
-       zip -r tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-7.5.zip opt > /dev/null 2>&1;
-       cp tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-7.5.zip $ZIP_PKG_DIR/
+       zip -r tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-8.0.zip opt > /dev/null 2>&1;
+       cp tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-8.0.zip $ZIP_PKG_DIR/
        cd ..
 
        CURRENT_LOOP_COUNT=$((CURRENT_LOOP_COUNT+1))
index b2fdc7d574eb7c815d11bd0b3ece7dfbe30df6a3..667761b07c557a9ed9f8fb4d15c7d6b4cb89b8dc 100755 (executable)
@@ -30,7 +30,7 @@ def regen():
                                tf.write('    <auto_tcn>'+AUTO_NUM+'</auto_tcn>\n')
                                tf.write('    <manual_tcn>'+MAN_NUM+'</manual_tcn>\n')
                                tf.write('    <total_tcn>'+TOT_NUM+'</total_tcn>\n')
-                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-7.5.zip</pkg_name>\n')
+                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-8.0.zip</pkg_name>\n')
                                tf.write('  </suite>\n')
 
                                found = 0;
@@ -49,7 +49,7 @@ def regen():
                                tf.write('    <auto_tcn>'+AUTO_NUM+'</auto_tcn>\n')
                                tf.write('    <manual_tcn>'+MAN_NUM+'</manual_tcn>\n')
                                tf.write('    <total_tcn>'+TOT_NUM+'</total_tcn>\n')
-                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-7.5.zip</pkg_name>\n')
+                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-8.0.zip</pkg_name>\n')
                                tf.write('  </suite>\n')
                                tf.write(line+'\n')
                        else:
index f79dbfd95592a9e8af959a72d3fa762c5903edd1..863f132135f474f90765a188eb403c2b60d0249a 100755 (executable)
@@ -83,7 +83,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE):
                        PKG_FNAME=PKG_VNAME+'.tpk'
                        if ( os.path.exists(TPK_DIR+dirSeparator+PKG_FNAME) == False):
                                sys.exit('Package Not Found '+PKG_VNAME)
-                       TIZEN____='tizen_native_7.5'
+                       TIZEN____='tizen_native_8.0'
                        TCT_DIR='opt'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE
                        TO_PKG_DIR=dirSeparator+'opt'+dirSeparator+'tct'+dirSeparator+TIZEN____+dirSeparator+'packages'
 
@@ -167,7 +167,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE):
                                gentestsxml.gentestxmlfile(dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator, TC_COUNT)
 
                        # zip
-                       print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-7.5.zip file')
+                       print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-8.0.zip file')
 
                        # clear old zips
                        removeDir(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages')
@@ -175,14 +175,14 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE):
 
                        # create new zip
                        #os.chdir(dirSeparator+'tmp')
-                       zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.zip', True, dirSeparator)
+                       zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-8.0.zip', True, dirSeparator)
 
                        # deployment
                        print('-- Suite deployment...')
-                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.zip')
+                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-8.0.zip')
                        if ( os.path.exists(TO_PKG_DIR+dirSeparator+PROFILE) == False):
                                os.makedirs(TO_PKG_DIR+dirSeparator+PROFILE)
-                       shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.zip', TO_PKG_DIR+dirSeparator+PROFILE)
+                       shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-8.0.zip', TO_PKG_DIR+dirSeparator+PROFILE)
                        print('---- Updating '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml')
                        status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'tcpackageslistsgen.py '+TYPE+' '+MODNAME+' '+PROFILE+' '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml 0'+' '+TC_COUNT+' '+ARCH)
                        if ( status > 0 ):
index d62c71d1d016625318558bd12b9603958fe86dab..f3ed568575b56cab3de08969d97f804cc732ebcc 100755 (executable)
@@ -82,7 +82,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE):
                        PKG_FNAME=PKG_VNAME+'.tpk'
                        if ( os.path.exists(TPK_DIR+dirSeparator+PKG_FNAME) == False):
                                sys.exit('Package Not Found '+PKG_VNAME)
-                       TIZEN____='tizen_native_7.5'
+                       TIZEN____='tizen_native_8.0'
                        TCT_DIR='opt'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE
                        TO_PKG_DIR=dirSeparator+'opt'+dirSeparator+'tct'+dirSeparator+TIZEN____+dirSeparator+'packages'
 
@@ -157,7 +157,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE):
                                gentestsxml.gentestxmlfile(dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator, TC_COUNT)
 
                        # zip
-                       print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-7.5.zip file')
+                       print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-8.0.zip file')
 
                        # clear old zips
                        removeDir(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages')
@@ -165,14 +165,14 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE):
 
                        # create new zip
                        #os.chdir(dirSeparator+'tmp')
-                       zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.zip', True, dirSeparator)
+                       zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-8.0.zip', True, dirSeparator)
 
                        # deployment
                        print('-- Suite deployment...')
-                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.zip')
+                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-8.0.zip')
                        if ( os.path.exists(TO_PKG_DIR+dirSeparator+PROFILE) == False):
                                os.makedirs(TO_PKG_DIR+dirSeparator+PROFILE)
-                       shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.zip', TO_PKG_DIR+dirSeparator+PROFILE)
+                       shutil.copy(dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-8.0.zip', TO_PKG_DIR+dirSeparator+PROFILE)
                        print('---- Updating '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml')
                        status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'tcpackageslistsgen.py '+TYPE+' '+MODNAME+' '+PROFILE+' '+TO_PKG_DIR+dirSeparator+'pkg_infos'+dirSeparator+PROFILE+'_pkg_info.xml 0'+' '+TC_COUNT+' '+ARCH)
                        if ( status > 0 ):
diff --git a/tool/NativeTCT_7.5.tar.gz b/tool/NativeTCT_7.5.tar.gz
deleted file mode 100644 (file)
index 68597b6..0000000
Binary files a/tool/NativeTCT_7.5.tar.gz and /dev/null differ
diff --git a/tool/NativeTCT_8.0.tar.gz b/tool/NativeTCT_8.0.tar.gz
new file mode 100644 (file)
index 0000000..141c5bb
Binary files /dev/null and b/tool/NativeTCT_8.0.tar.gz differ