Update repository sync

.ci/spec/create-hosts.sh

@@ -39,7 +39,7 @@ wrap curl -fLO ${INSTALLER_URL} \
 
 echo "Creating vagrant spec guests..."
 wrap_stream packet-exec run -upload --  "vagrant up --no-provision --provider vmware_desktop" \
-                                        "Vagrant Blackbox host creation command failed"
+                                        "Vagrant Acceptance host creation command failed"
 
 
 echo "Finished bringing up vagrant spec guests"

.ci/spec/run-test.sh

@@ -27,6 +27,6 @@ export PKT_VAGRANT_DOCKER_IMAGES="${VAGRANT_DOCKER_IMAGES}"
 echo "Running vagrant spec tests..."
 # Need to make memory customizable for windows hosts
 wrap_stream packet-exec run "vagrant provision" \
-                "Vagrant Blackbox testing command failed"
+                "Vagrant Acceptance testing command failed"
 
 echo "Finished vagrant spec tests"

.ci/sync.sh

@@ -11,11 +11,14 @@ export PATH="${PATH}:${root}/.ci"
 pushd "${root}" > "${output}"
 
 if [ "${repo_name}" = "vagrant" ]; then
-    remote_repository="hashicorp/vagrant-blackbox"
+    remote_repository="hashicorp/vagrant-acceptance"
 else
   fail "This repository is not configured to sync vagrant to mirror repository"
 fi
 
+wrap git config pull.rebase false \
+     "Failed to configure git pull strategy"
+
 echo "Adding remote mirror repository '${remote_repository}'..."
 wrap git remote add mirror "https://${HASHIBOT_USERNAME}:${HASHIBOT_TOKEN}@github.com/${remote_repository}" \
      "Failed to add mirror '${remote_repository}' for sync"

.github/workflows/code.yml

@@ -5,7 +5,7 @@ on:
       - 'spec-test-*'
 
 jobs:
-  sync-blackbox:
+  sync-acceptance:
     if: github.repository == 'hashicorp/vagrant'
     runs-on: ubuntu-18.04
     steps:
@@ -18,7 +18,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'
-      - name: Sync Blackbox Testing Repository
+      - name: Sync Acceptance Testing Repository
         run: ./.ci/sync.sh
         working-directory: ${{github.workspace}}
         env: