[Scripts][NonACR][scripts changes done for new tizen 7.5 branch build and installation] 99/285199/3
authorAnkit Srivastava <ankit.sri1@samsung.com>
Wed, 7 Dec 2022 09:37:16 +0000 (15:07 +0530)
committerAnkit Srivastava <ankit.sri1@samsung.com>
Thu, 8 Dec 2022 09:45:27 +0000 (15:15 +0530)
Change-Id: I2b23c7733f5cb2f4ffda71fcd0d3cd025efb0c6d
Signed-off-by: Ankit Srivastava <ankit.sri1@samsung.com>
scripts_tpk/child-package-generator.sh
scripts_tpk/tcpackageslistsgen.py
scripts_tpk/tpk-install.py
scripts_tpk/tpk_create.sh
scripts_tpk/tpksdk-install.py

index 027693ccd9445f9b516bb3ec52827265ef65ce03..ea46298fd842e626530dde96b7dbf679379e6045 100755 (executable)
@@ -13,9 +13,9 @@ if [ $BUILD_TC_TYPE = "utc" ]; then
         PREFIX="core"
 fi
 
-TIZEN____="tizen_native_7.0"
+TIZEN____="tizen_native_7.5"
 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.0.zip"
+TCT_PKG_NAME="tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME-7.5.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.0.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-7.5.zip</pkg_name>"
                        PKG_INFO_6="  </suite>"
                        echo $PKG_INFO_1 >> $PKG_INFO_FILE\_NEW
                        echo $PKG_INFO_2 >> $PKG_INFO_FILE\_NEW
@@ -156,7 +156,7 @@ do
                        echo $PKG_INFO_5 >> $PKG_INFO_FILE\_NEW
                        echo $PKG_INFO_6 >> $PKG_INFO_FILE\_NEW
                        CURRENT_LOOP_COUNT=$((CURRENT_LOOP_COUNT+1))
-               done    
+               done
        fi
        echo "$LINE" >> $PKG_INFO_FILE\_NEW
 done < $PKG_INFO_FILE
@@ -173,15 +173,15 @@ do
                break
        fi
        mkdir -p child_packages_$CURRENT_LOOP_COUNT
-       cd child_packages_$CURRENT_LOOP_COUNT   
+       cd child_packages_$CURRENT_LOOP_COUNT
        mkdir -p opt
        mkdir -p opt/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT
        cp -rf ../../opt/$TCT_PKG/* ./opt/tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT/
        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.0.zip opt > /dev/null 2>&1;
-       cp tct-$MOD_NAME-$PREFIX_PKG_NAME-$TAG_SPEC_PKG_NAME\_$CURRENT_LOOP_COUNT-7.0.zip $ZIP_PKG_DIR/
+       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/
        cd ..
 
        CURRENT_LOOP_COUNT=$((CURRENT_LOOP_COUNT+1))
index d270e35af50e1ecae8435fe0b0d1389bba9e6970..b2fdc7d574eb7c815d11bd0b3ece7dfbe30df6a3 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.0.zip</pkg_name>\n')
+                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-7.5.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.0.zip</pkg_name>\n')
+                               tf.write('    <pkg_name>'+PROFILE+'/tct-'+MODULE_NAME+'-native-'+TYPE+'-7.5.zip</pkg_name>\n')
                                tf.write('  </suite>\n')
                                tf.write(line+'\n')
                        else:
index 348054036e0c0d70b94ba45f32042ff2bc9a9c0c..f79dbfd95592a9e8af959a72d3fa762c5903edd1 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.0'
+                       TIZEN____='tizen_native_7.5'
                        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.0.zip file')
+                       print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-7.5.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.0.zip', True, dirSeparator)
+                       zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.zip', True, dirSeparator)
 
                        # deployment
                        print('-- Suite deployment...')
-                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.0.zip')
+                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.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.0.zip', 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)
                        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 6eb87dce2097c025337d73131a3b54b605d429d9..e20c10cb711254d184b7765ac24ee30d7b3e11eb 100755 (executable)
@@ -599,7 +599,7 @@ if [ "$ARCH_TYPE" == "x86" ]; then
 else
          WORKSPACE_PATH="$HOME/workspace_${PROFILE_TYPE}_${ARCH_TYPE}"
 fi
-CURRENT_VERSION="7.0"
+CURRENT_VERSION="7.5"
 
 #####Check for architecture in case of TV  profile##########
 if [ "$ARCH_TYPE" != "arm" ];  then
index c1772fe1eb568b3ba56b79511c13d01a9324aceb..d62c71d1d016625318558bd12b9603958fe86dab 100755 (executable)
@@ -82,10 +82,10 @@ 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.0'
+                       TIZEN____='tizen_native_7.5'
                        TCT_DIR='opt'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE
                        TO_PKG_DIR=dirSeparator+'opt'+dirSeparator+'tct'+dirSeparator+TIZEN____+dirSeparator+'packages'
-                       
+
                        print('Deploying '+TYPE+'->'+MODNAME+' suite to tct-mgr...')
                        # prepare tct directory and files
                        print('-- Preparing suite .zip file...')
@@ -96,7 +96,7 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE):
                        # README
                        print('---- Copying '+dirSeparator+'tmp'+dirSeparator+TCT_DIR)
                        shutil.copy('scripts_tpk'+dirSeparator+'README', dirSeparator+'tmp'+dirSeparator+TCT_DIR)
-                       
+
                        # tpk
                        print('---- Copying '+dirSeparator+'tmp'+dirSeparator+TCT_DIR+' package')
                        try:
@@ -127,14 +127,14 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE):
                        #if ( (status % 256) != 0 ):
                        #       sys.exit('Error executing inst.sh!!! Aborting...')
                        os.chmod(dirSeparator+'tmp'+dirSeparator+TCT_DIR+dirSeparator+'inst.sh', stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH|stat.S_IRUSR|stat.S_IRGRP|stat.S_IROTH|stat.S_IWUSR)
-                       
+
                        # tests.xml
                        print('---- Generating '+dirSeparator+'tmp'+dirSeparator+TCT_DIR)
                        status, output=subprocess.getstatusoutput('scripts_tpk'+dirSeparator+'tctestsgen.py '+TYPE+' '+MODNAME+' '+dirSeparator+'tmp'+dirSeparator+TCT_DIR+' '+PROFILE+' '+ARCH)
                        if ( status > 0 ):
                                print('Failed to execute tctestsgen.py!!!')
                                sys.exit('Aborting...')
-                       
+
                        # external_wrapper.sh
                        process_dali_application = "dali-application"
                        process1 = "dali-"
@@ -155,9 +155,9 @@ def install(TYPE, MODNAME, PROFILE, TC_COUNT, ARCH, COVERAGE):
                        # gentestsxml.py generate multiple TC in tests.xml
                        if int(TC_COUNT) > 1:
                                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.0.zip file')
+                       print('---- Preparing '+dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-'+'native-'+TYPE+'-7.5.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.0.zip', True, dirSeparator)
+                       zipper(dirSeparator+'tmp'+dirSeparator+'opt', dirSeparator+'tmp'+dirSeparator+'tct'+dirSeparator+'packages'+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.zip', True, dirSeparator)
 
                        # deployment
                        print('-- Suite deployment...')
-                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.0.zip')
+                       print('---- Copying '+TO_PKG_DIR+dirSeparator+PROFILE+dirSeparator+'tct-'+MODNAME+'-native-'+TYPE+'-7.5.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.0.zip', 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)
                        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 ):
@@ -266,5 +266,3 @@ if ( module == None ):
        instLog.close()
 
 os.remove('install.log')
-       
-