Minor updates to build scripts and .gitignore

.gitignore

@@ -16,32 +16,14 @@ build/logs/
 keepLocal
 .project
 .pydevproject
-#	build/awips-ade-server/
 build/clean.sh
 cave/diff.txt
 cave/menus/
-cmap.sh
-#	docs/images/ColoredSurfaceTemperature.png
-#	docs/images/RTOFS-barotropicv.png
-#	docs/images/RTOFS-current.png
-#	docs/images/RTOFS-wtemp.png
 edexOsgi/build.edex/opt/db/replication/
-#	edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/colormaps/
-#	edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/derivedParameters/
-#	edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/
-#	edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/styleRules/
 edexOsgi/com.raytheon.uf.edex.dissemination/
 edexOsgi/com.raytheon.uf.edex.ndm/
 edexOsgi/deploy.edex.awips2/esb/conf/resources/
 	feature.xml
-getRPMoutput.pl
-	modelNames.sh
+scripts
 output/
-	rpmOutput
-	rpms/awips2.core/Installer.localization/createRadarsInUse.sh
-	rpms/awips2.upc/Installer.metpy/
-	scripts/
-	sync.sh
-	sync_dev.sh
-	thriftServerUsersUnique.log
-
+rpms/awips2.upc/Installer.metpy/

awips_install.sh

@@ -30,7 +30,7 @@ function check_yumfile {
     exit
   fi
   if [ -f /etc/yum.repos.d/awips2.repo ]; then
-    date=$(date +%Y%m%d-%H:%M%:S)
+    date=$(date +%Y%m%d-%H:%M:%S)
     cp /etc/yum.repos.d/awips2.repo /etc/yum.repos.d/awips2.repo-${date}
   fi
 
@@ -144,19 +144,21 @@ function remove_edex {
       break;
     fi
   done
-  date=$(date +'%Y%m%d-%H:%M%:S')
+  date=$(date +'%Y%m%d-%H:%M:%S')
   backup_dir=${backup_dir}/awips2_backup_${date}
   echo "Backing up to $backup_dir"
 
   rsync -aP /awips2/database/data/pg_hba.conf $backup_dir/
   rsync -aP /awips2/edex/data/utility $backup_dir/
   rsync -aP /awips2/edex/bin $backup_dir/
   rsync -aP /awips2/ldm $backup_dir/
+  rsync -aP /awips2/dev $backup_dir/
   rsync -aP /awips2/edex/conf $backup_dir/
   rsync -aP /awips2/edex/etc $backup_dir/
+  rsync -aP /awips2/edex/logs $backup_dir/
   rsync -aP /usr/bin/edex $backup_dir/
   rsync -aP /etc/init.d/edexServiceList $backup_dir/init.d/
-  rsync -aP /etc/spool/cron/awips $backup_dir/
+  rsync -aP /var/spool/cron/awips $backup_dir/
 
   if [[ $(rpm -qa | grep awips2-cave) ]]; then
     echo "CAVE is also installed, now removing EDEX and CAVE"

build/setup.sh

@@ -55,11 +55,19 @@ sudo docker exec -ti $dockerID /bin/bash -xec "/awips2/repo/awips2-builds/build/
 date=$(date +%Y%m%d)
 
 if [[ $(whoami) == "awips" ]]; then # local build
+  #copy awips_install-YYYYMMDD.sh to robin
+  cp awips_install.sh awips_install-${date}.sh
+  sed -i 's/el7.repo/el7-test.repo/' awips_install-${date}.sh
+  rsync -aP awips_install-${date}.sh tiffanym@robin:/content/software/awips2/
+
+  #For testing, copy el7-test.repo to robin with updated path
+  #sed -i 's/el7-dev-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]/el7-dev-${date}/' dist/el7-test.repo
+
   mv dist/${os_version}-dev dist/${os_version}-dev-${date}
   sudo su - -c "createrepo -g /awips2/repo/awips2/dist/comps.xml /awips2/repo/awips2/dist/${os_version}-dev-${date}/"
   sudo chown -R awips:fxalpha dist/${os_version}-dev-${date}
-  rsync -aP dist/${os_version}-dev-${date} awips@hardy:~/
   rsync -aP dist/${os_version}-dev-${date} tomcat@robin:/web/content/repos/yum/
+  rsync -aP dist/${os_version}-dev-${date} awips@hardy:~/
   #repomanage -k1 --old dist/${os_version}-dev | xargs rm -f
   #
   # Push to web server