Merge pull request #2627 from qliphy/master

Port #2626 from Kenyi

bin/MadGraph5_aMCatNLO/submit_cmsconnect_gridpack_generation.sh

@@ -14,7 +14,7 @@ cat<<-EOF
 	Log = condor_log/job.log.\$(Cluster) 
 	
 	transfer_input_files = $input_files, gridpack_generation.sh, /usr/bin/unzip
-	transfer_output_files = ${card_name}.log
+	transfer_output_files = ${card_name}.log, ${sandbox_output}
 	transfer_output_remaps = "${card_name}.log = ${card_name}_codegen.log"
 	+WantIOProxy=true
         +IsGridpack=true
@@ -77,21 +77,23 @@ cat<<-EOF
 	    echo "The xrdcp command below failed:"
 	    echo "xrdcp -f \${condor_scratch}$sandbox_output root://stash.osgconnect.net:1094/${stash_tmpdir##/stash}/$sandbox_output"
 	fi
-	# Second, try condor_chirp
-	echo ">> Copying sandbox via condor_chirp"
-	CONDOR_CHIRP_BIN=\$(command -v condor_chirp)
-	if [ \$? != 0 ]; then
-	    if [ -n "\${CONDOR_CONFIG}" ]; then
-	        CONDOR_CHIRP_BIN="\$(dirname \$CONDOR_CONFIG)/main/condor/libexec/condor_chirp"
-	    fi
-	fi
-	"\${CONDOR_CHIRP_BIN}" put -perm 644 "\${condor_scratch}/$sandbox_output" "$sandbox_output"
-	exitcode=\$?
-	if [ \$exitcode -ne 0 ]; then
-	    echo "condor_chirp failed. Exiting with error code 210."
-	    exit 210
-	fi
-	rm "\${condor_scratch}/$sandbox_output"
+        # Temporarily disable condor_chirp
+        # until this feature comes back in CMS
+	## Second, try condor_chirp
+	#echo ">> Copying sandbox via condor_chirp"
+	#CONDOR_CHIRP_BIN=\$(command -v condor_chirp)
+	#if [ \$? != 0 ]; then
+	#    if [ -n "\${CONDOR_CONFIG}" ]; then
+	#        CONDOR_CHIRP_BIN="\$(dirname \$CONDOR_CONFIG)/main/condor/libexec/condor_chirp"
+	#    fi
+	#fi
+	#"\${CONDOR_CHIRP_BIN}" put -perm 644 "\${condor_scratch}/$sandbox_output" "$sandbox_output"
+	#exitcode=\$?
+	#if [ \$exitcode -ne 0 ]; then
+	#    echo "condor_chirp failed. Exiting with error code 210."
+	#    exit 210
+	#fi
+	#rm "\${condor_scratch}/$sandbox_output"
 
 EOF
 }