Merge pull request #626 from patmarion/upload-files-script

update and use copy_files.sh
RobotLocomotion · Sep 24, 2019 · 4c3e570 · 4c3e570
2 parents 7139b80 + 4fa7bf9
commit 4c3e570
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/distro/travis/copy_files.sh b/distro/travis/copy_files.sh
@@ -4,17 +4,17 @@ set -e
 
 scriptDir=$(cd $(dirname $0) && pwd)
 
-if [ -z "$encrypted_444f3458e047_key" ]; then
+if [ -z "$encrypted_copyfiles_password" ]; then
   echo "encrypted ssh keys not available. ignoring request to copy files:" $*
   exit 0
 fi
 
-openssl aes-256-cbc -K $encrypted_444f3458e047_key -iv $encrypted_444f3458e047_iv -in $scriptDir/travisci.key.enc -out $scriptDir/travisci.key -d
-chmod 600 $scriptDir/travisci.key
+openssl aes-256-cbc -k $encrypted_copyfiles_password -in $scriptDir/director_upload_key.enc -out $scriptDir/director_upload_key -d
+chmod 600 $scriptDir/director_upload_key
 
 dest=$encrypted_copyfiles_host
-user=travis
+user=pat
 
 mkdir -p ~/.ssh
 ssh-keyscan -H $dest >> ~/.ssh/known_hosts
-scp -i $scriptDir/travisci.key $* $user@$dest:files/
+scp -i $scriptDir/director_upload_key $* $user@$dest:director_upload_files/
diff --git a/distro/travis/director_upload_key.enc b/distro/travis/director_upload_key.enc
diff --git a/distro/travis/docs_and_package.sh b/distro/travis/docs_and_package.sh
@@ -22,21 +22,21 @@ make_docs()
   tar -czf doxygen_docs.tar.gz doxygen_docs
   tar -czf python_coverage.tar.gz python_coverage
 
-  $scriptDir/bintray_upload.sh $verionString $TRAVIS_BUILD_DIR/docs/*.tar.gz
+  $scriptDir/copy_files.sh $TRAVIS_BUILD_DIR/docs/*.tar.gz
 }
 
 make_linux_package()
 {
   cd $TRAVIS_BUILD_DIR/distro/package
   ./make_linux_package.sh 2>&1 > log.txt || cat log.txt
-  $scriptDir/bintray_upload.sh $versionString $TRAVIS_BUILD_DIR/distro/package/*.tar.gz
+  $scriptDir/copy_files.sh $TRAVIS_BUILD_DIR/distro/package/*.tar.gz
 }
 
 make_mac_package()
 {
   cd $TRAVIS_BUILD_DIR/distro/package
   ./make_mac_package.sh 2>&1 > log.txt || cat log.txt
-  $scriptDir/bintray_upload.sh $versionString $TRAVIS_BUILD_DIR/distro/package/*.tar.gz
+  $scriptDir/copy_files.sh $TRAVIS_BUILD_DIR/distro/package/*.tar.gz
 }
 
 make_package()

diff --git a/distro/travis/test_docker.sh b/distro/travis/test_docker.sh
@@ -33,5 +33,6 @@ docker build -f $root_dir/distro/travis/ubuntu${UBUNTU_TEST_VERSION}.dockerfile
   --build-arg encrypted_444f3458e047_key="$encrypted_444f3458e047_key" \
   --build-arg encrypted_444f3458e047_iv="$encrypted_444f3458e047_iv" \
   --build-arg encrypted_copyfiles_host="$encrypted_copyfiles_host" \
+  --build-arg encrypted_copyfiles_password="$encrypted_copyfiles_password" \
   --build-arg encrypted_bintray_api_key="$encrypted_bintray_api_key" \
   $root_dir
diff --git a/distro/travis/ubuntu14.dockerfile b/distro/travis/ubuntu14.dockerfile
@@ -15,6 +15,7 @@ ARG TRAVIS_BUILD_DIR
 ARG encrypted_444f3458e047_key
 ARG encrypted_444f3458e047_iv
 ARG encrypted_copyfiles_host
+ARG encrypted_copyfiles_password
 ARG encrypted_bintray_api_key
 
 ENV \
@@ -34,6 +35,7 @@ ENV \
     encrypted_444f3458e047_key="${encrypted_444f3458e047_key}" \
     encrypted_444f3458e047_iv="${encrypted_444f3458e047_iv}" \
     encrypted_copyfiles_host="${encrypted_copyfiles_host}" \
+    encrypted_copyfiles_password="${encrypted_copyfiles_password}" \
     encrypted_bintray_api_key="${encrypted_bintray_api_key}"
 
 

diff --git a/distro/travis/ubuntu16.dockerfile b/distro/travis/ubuntu16.dockerfile
@@ -15,6 +15,7 @@ ARG TRAVIS_BUILD_DIR
 ARG encrypted_444f3458e047_key
 ARG encrypted_444f3458e047_iv
 ARG encrypted_copyfiles_host
+ARG encrypted_copyfiles_password
 ARG encrypted_bintray_api_key
 
 ENV \
@@ -34,6 +35,7 @@ ENV \
     encrypted_444f3458e047_key="${encrypted_444f3458e047_key}" \
     encrypted_444f3458e047_iv="${encrypted_444f3458e047_iv}" \
     encrypted_copyfiles_host="${encrypted_copyfiles_host}" \
+    encrypted_copyfiles_password="${encrypted_copyfiles_password}" \
     encrypted_bintray_api_key="${encrypted_bintray_api_key}"
 
 

diff --git a/distro/travis/ubuntu18.dockerfile b/distro/travis/ubuntu18.dockerfile
@@ -15,6 +15,7 @@ ARG TRAVIS_BUILD_DIR
 ARG encrypted_444f3458e047_key
 ARG encrypted_444f3458e047_iv
 ARG encrypted_copyfiles_host
+ARG encrypted_copyfiles_password
 ARG encrypted_bintray_api_key
 
 ENV \
@@ -34,6 +35,7 @@ ENV \
     encrypted_444f3458e047_key="${encrypted_444f3458e047_key}" \
     encrypted_444f3458e047_iv="${encrypted_444f3458e047_iv}" \
     encrypted_copyfiles_host="${encrypted_copyfiles_host}" \
+    encrypted_copyfiles_password="${encrypted_copyfiles_password}" \
     encrypted_bintray_api_key="${encrypted_bintray_api_key}"