{"action":"created","comment":{"url":"https://api.github.com/repos/servo/saltfs/pulls/comments/65772031","id":65772031,"diff_hunk":"@@ -3,24 +3,52 @@\n set -o errexit\n set -o nounset\n \n-if [ \"${SALT_NODE_ID}\" = \"test\" ]; then\n-    # Using .travis.yml to specify Python 3.5 to be preinstalled, just to check\n-    printf \"Using $(python3 --version) at $(which python3)\\n\"\n+travis_fold_start () {\n+    printf \"travis_fold:start:$1\\n\"\n+    printf \"$2\\n\"\n+}\n \n-    # Run test suite separately for parallelism\n-    ./test.py\n-else\n+travis_fold_end () {\n+    printf \"travis_fold:end:$1\\n\"\n+}\n+\n+run_salt () {\n+    travis_fold_start \"salt.install.$1\" 'Installing and configuring Salt'\n     .travis/install_salt.sh -F -c .travis -- \"${TRAVIS_OS_NAME}\"\n     .travis/setup_salt_roots.sh\n+    travis_fold_end \"salt.install.$1\"\n \n-    # For debugging, check the grains reported by the Travis builder\n+    travis_fold_start \"grains.items.$1\" 'Printing Salt grains for debugging'\n     sudo salt-call --id=\"${SALT_NODE_ID}\" grains.items\n+    travis_fold_end \"grains.items.$1\"\n \n-    # Minimally validate YAML and Jinja at a basic level\n+    travis_fold_start \"state.show_highstate.$1\" 'Performing basic YAML and Jinja validation'\n     sudo salt-call --id=\"${SALT_NODE_ID}\" --retcode-passthrough state.show_highstate\n-    # Full on installation test\n+    travis_fold_end \"state.show_highstate.$1\"\n+\n+    printf 'Running the full Salt highstate\\n'\n     sudo salt-call --id=\"${SALT_NODE_ID}\" --retcode-passthrough --log-level=warning state.highstate\n+}\n+\n+\n+if [ \"${SALT_NODE_ID}\" = \"test\" ]; then\n+    # Using .travis.yml to specify Python 3.5 to be preinstalled, just to check\n+    printf \"Using $(python3 --version) at $(which python3)\\n\"\n+\n+    # Run test suite separately for parallelism\n+    ./test.py\n+else\n+    if [ \"${SALT_FROM_SCRATCH}\" = \"true\" ]; then\n+        run_salt 'scratch'\n+    else\n+        git checkout master","path":".travis/dispatch.sh","position":51,"original_position":51,"commit_id":"c66f555aa8aa2b4de3a4d923ceeb27dcb328991c","original_commit_id":"c66f555aa8aa2b4de3a4d923ceeb27dcb328991c","user":{"login":"aneeshusa","id":2085567,"avatar_url":"https://avatars.githubusercontent.com/u/2085567?v=3","gravatar_id":"","url":"https://api.github.com/users/aneeshusa","html_url":"https://github.com/aneeshusa","followers_url":"https://api.github.com/users/aneeshusa/followers","following_url":"https://api.github.com/users/aneeshusa/following{/other_user}","gists_url":"https://api.github.com/users/aneeshusa/gists{/gist_id}","starred_url":"https://api.github.com/users/aneeshusa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aneeshusa/subscriptions","organizations_url":"https://api.github.com/users/aneeshusa/orgs","repos_url":"https://api.github.com/users/aneeshusa/repos","events_url":"https://api.github.com/users/aneeshusa/events{/privacy}","received_events_url":"https://api.github.com/users/aneeshusa/received_events","type":"User","site_admin":false},"body":"I'm pretty sure this was working on Travis last time I checked.\r\nI think this is caused by Travis doing a shallow clone and running git checkout in different ways on PRs vs branches (auto); I think I can find a workaround.","created_at":"2016-06-03T20:40:02Z","updated_at":"2016-06-03T20:40:02Z","html_url":"https://github.com/servo/saltfs/pull/374#discussion_r65772031","pull_request_url":"https://api.github.com/repos/servo/saltfs/pulls/374","_links":{"self":{"href":"https://api.github.com/repos/servo/saltfs/pulls/comments/65772031"},"html":{"href":"https://github.com/servo/saltfs/pull/374#discussion_r65772031"},"pull_request":{"href":"https://api.github.com/repos/servo/saltfs/pulls/374"}}},"pull_request":{"url":"https://api.github.com/repos/servo/saltfs/pulls/374","id":70113321,"html_url":"https://github.com/servo/saltfs/pull/374","diff_url":"https://github.com/servo/saltfs/pull/374.diff","patch_url":"https://github.com/servo/saltfs/pull/374.patch","issue_url":"https://api.github.com/repos/servo/saltfs/issues/374","number":374,"state":"open","locked":false,"title":"Also test Salt config changes as an upgrade","user":{"login":"aneeshusa","id":2085567,"avatar_url":"https://avatars.githubusercontent.com/u/2085567?v=3","gravatar_id":"","url":"https://api.github.com/users/aneeshusa","html_url":"https://github.com/aneeshusa","followers_url":"https://api.github.com/users/aneeshusa/followers","following_url":"https://api.github.com/users/aneeshusa/following{/other_user}","gists_url":"https://api.github.com/users/aneeshusa/gists{/gist_id}","starred_url":"https://api.github.com/users/aneeshusa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aneeshusa/subscriptions","organizations_url":"https://api.github.com/users/aneeshusa/orgs","repos_url":"https://api.github.com/users/aneeshusa/repos","events_url":"https://api.github.com/users/aneeshusa/events{/privacy}","received_events_url":"https://api.github.com/users/aneeshusa/received_events","type":"User","site_admin":false},"body":"The current testing always starts from scratch.\r\nHowever, in practice we do not rebuild all our machines from scratch\r\non every change, but instead usually incrementally upgrade them.\r\n\r\nRun the tests both from scratch, which is used whenever we stand up\r\na new builder, and as an upgrade from the previous configuration, which\r\nis the more common case.\r\n\r\nAdditionally, the Salt installation and Salt grains.items and\r\nstate.show_highstate commands produce output that is useful for\r\ndebugging, but is normally not necessary to view.\r\nAdd special markers to the build log that fold these sections on Travis.\r\nThis is especially useful with the longer build logs.\r\n\r\nNote that this doubles the number of builds run on Travis.\r\n\r\nr? @larsbergstrom @edunham\r\n\r\n<!-- Reviewable:start -->\r\n---\r\nThis change is [<img src=\"https://reviewable.io/review_button.svg\" height=\"35\" align=\"absmiddle\" alt=\"Reviewable\"/>](https://reviewable.io/reviews/servo/saltfs/374)\r\n<!-- Reviewable:end -->\r\n","created_at":"2016-05-15T06:12:22Z","updated_at":"2016-06-03T20:40:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"9666e28d9ca5b2789aa38756751a2e3581560200","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/servo/saltfs/pulls/374/commits","review_comments_url":"https://api.github.com/repos/servo/saltfs/pulls/374/comments","review_comment_url":"https://api.github.com/repos/servo/saltfs/pulls/comments{/number}","comments_url":"https://api.github.com/repos/servo/saltfs/issues/374/comments","statuses_url":"https://api.github.com/repos/servo/saltfs/statuses/c66f555aa8aa2b4de3a4d923ceeb27dcb328991c","head":{"label":"aneeshusa:test-upgradeability-on-travis","ref":"test-upgradeability-on-travis","sha":"c66f555aa8aa2b4de3a4d923ceeb27dcb328991c","user":{"login":"aneeshusa","id":2085567,"avatar_url":"https://avatars.githubusercontent.com/u/2085567?v=3","gravatar_id":"","url":"https://api.github.com/users/aneeshusa","html_url":"https://github.com/aneeshusa","followers_url":"https://api.github.com/users/aneeshusa/followers","following_url":"https://api.github.com/users/aneeshusa/following{/other_user}","gists_url":"https://api.github.com/users/aneeshusa/gists{/gist_id}","starred_url":"https://api.github.com/users/aneeshusa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aneeshusa/subscriptions","organizations_url":"https://api.github.com/users/aneeshusa/orgs","repos_url":"https://api.github.com/users/aneeshusa/repos","events_url":"https://api.github.com/users/aneeshusa/events{/privacy}","received_events_url":"https://api.github.com/users/aneeshusa/received_events","type":"User","site_admin":false},"repo":{"id":41046995,"name":"servo-saltfs","full_name":"aneeshusa/servo-saltfs","owner":{"login":"aneeshusa","id":2085567,"avatar_url":"https://avatars.githubusercontent.com/u/2085567?v=3","gravatar_id":"","url":"https://api.github.com/users/aneeshusa","html_url":"https://github.com/aneeshusa","followers_url":"https://api.github.com/users/aneeshusa/followers","following_url":"https://api.github.com/users/aneeshusa/following{/other_user}","gists_url":"https://api.github.com/users/aneeshusa/gists{/gist_id}","starred_url":"https://api.github.com/users/aneeshusa/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aneeshusa/subscriptions","organizations_url":"https://api.github.com/users/aneeshusa/orgs","repos_url":"https://api.github.com/users/aneeshusa/repos","events_url":"https://api.github.com/users/aneeshusa/events{/privacy}","received_events_url":"https://api.github.com/users/aneeshusa/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/aneeshusa/servo-saltfs","description":"Salt Stack Filesystem","fork":true,"url":"https://api.github.com/repos/aneeshusa/servo-saltfs","forks_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/forks","keys_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/teams","hooks_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/hooks","issue_events_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/issues/events{/number}","events_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/events","assignees_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/assignees{/user}","branches_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/branches{/branch}","tags_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/tags","blobs_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/git/refs{/sha}","trees_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/statuses/{sha}","languages_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/languages","stargazers_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/stargazers","contributors_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/contributors","subscribers_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/subscribers","subscription_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/subscription","commits_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/commits{/sha}","git_commits_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/git/commits{/sha}","comments_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/comments{/number}","issue_comment_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/issues/comments{/number}","contents_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/contents/{+path}","compare_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/merges","archive_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/downloads","issues_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/issues{/number}","pulls_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/pulls{/number}","milestones_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/milestones{/number}","notifications_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/labels{/name}","releases_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/releases{/id}","deployments_url":"https://api.github.com/repos/aneeshusa/servo-saltfs/deployments","created_at":"2015-08-19T16:47:30Z","updated_at":"2016-03-14T00:10:04Z","pushed_at":"2016-05-27T07:39:07Z","git_url":"git://github.com/aneeshusa/servo-saltfs.git","ssh_url":"git@github.com:aneeshusa/servo-saltfs.git","clone_url":"https://github.com/aneeshusa/servo-saltfs.git","svn_url":"https://github.com/aneeshusa/servo-saltfs","homepage":null,"size":468,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"servo:master","ref":"master","sha":"f10a2ca4cd9dccd56b90c79c6444c0d5686f177c","user":{"login":"servo","id":2566135,"avatar_url":"https://avatars.githubusercontent.com/u/2566135?v=3","gravatar_id":"","url":"https://api.github.com/users/servo","html_url":"https://github.com/servo","followers_url":"https://api.github.com/users/servo/followers","following_url":"https://api.github.com/users/servo/following{/other_user}","gists_url":"https://api.github.com/users/servo/gists{/gist_id}","starred_url":"https://api.github.com/users/servo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/servo/subscriptions","organizations_url":"https://api.github.com/users/servo/orgs","repos_url":"https://api.github.com/users/servo/repos","events_url":"https://api.github.com/users/servo/events{/privacy}","received_events_url":"https://api.github.com/users/servo/received_events","type":"Organization","site_admin":false},"repo":{"id":24253493,"name":"saltfs","full_name":"servo/saltfs","owner":{"login":"servo","id":2566135,"avatar_url":"https://avatars.githubusercontent.com/u/2566135?v=3","gravatar_id":"","url":"https://api.github.com/users/servo","html_url":"https://github.com/servo","followers_url":"https://api.github.com/users/servo/followers","following_url":"https://api.github.com/users/servo/following{/other_user}","gists_url":"https://api.github.com/users/servo/gists{/gist_id}","starred_url":"https://api.github.com/users/servo/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/servo/subscriptions","organizations_url":"https://api.github.com/users/servo/orgs","repos_url":"https://api.github.com/users/servo/repos","events_url":"https://api.github.com/users/servo/events{/privacy}","received_events_url":"https://api.github.com/users/servo/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/servo/saltfs","description":"Salt Stack Filesystem","fork":false,"url":"https://api.github.com/repos/servo/saltfs","forks_url":"https://api.github.com/repos/servo/saltfs/forks","keys_url":"https://api.github.com/repos/servo/saltfs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/servo/saltfs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/servo/saltfs/teams","hooks_url":"https://api.github.com/repos/servo/saltfs/hooks","issue_events_url":"https://api.github.com/repos/servo/saltfs/issues/events{/number}","events_url":"https://api.github.com/repos/servo/saltfs/events","assignees_url":"https://api.github.com/repos/servo/saltfs/assignees{/user}","branches_url":"https://api.github.com/repos/servo/saltfs/branches{/branch}","tags_url":"https://api.github.com/repos/servo/saltfs/tags","blobs_url":"https://api.github.com/repos/servo/saltfs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/servo/saltfs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/servo/saltfs/git/refs{/sha}","trees_url":"https://api.github.com/repos/servo/saltfs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/servo/saltfs/statuses/{sha}","languages_url":"https://api.github.com/repos/servo/saltfs/languages","stargazers_url":"https://api.github.com/repos/servo/saltfs/stargazers","contributors_url":"https://api.github.com/repos/servo/saltfs/contributors","subscribers_url":"https://api.github.com/repos/servo/saltfs/subscribers","subscription_url":"https://api.github.com/repos/servo/saltfs/subscription","commits_url":"https://api.github.com/repos/servo/saltfs/commits{/sha}","git_commits_url":"https://api.github.com/repos/servo/saltfs/git/commits{/sha}","comments_url":"https://api.github.com/repos/servo/saltfs/comments{/number}","issue_comment_url":"https://api.github.com/repos/servo/saltfs/issues/comments{/number}","contents_url":"https://api.github.com/repos/servo/saltfs/contents/{+path}","compare_url":"https://api.github.com/repos/servo/saltfs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/servo/saltfs/merges","archive_url":"https://api.github.com/repos/servo/saltfs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/servo/saltfs/downloads","issues_url":"https://api.github.com/repos/servo/saltfs/issues{/number}","pulls_url":"https://api.github.com/repos/servo/saltfs/pulls{/number}","milestones_url":"https://api.github.com/repos/servo/saltfs/milestones{/number}","notifications_url":"https://api.github.com/repos/servo/saltfs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/servo/saltfs/labels{/name}","releases_url":"https://api.github.com/repos/servo/saltfs/releases{/id}","deployments_url":"https://api.github.com/repos/servo/saltfs/deployments","created_at":"2014-09-20T04:16:27Z","updated_at":"2016-04-28T11:38:26Z","pushed_at":"2016-06-02T23:44:04Z","git_url":"git://github.com/servo/saltfs.git","ssh_url":"git@github.com:servo/saltfs.git","clone_url":"https://github.com/servo/saltfs.git","svn_url":"https://github.com/servo/saltfs","homepage":null,"size":570,"stargazers_count":10,"watchers_count":10,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":37,"mirror_url":null,"open_issues_count":58,"forks":37,"open_issues":58,"watchers":10,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/servo/saltfs/pulls/374"},"html":{"href":"https://github.com/servo/saltfs/pull/374"},"issue":{"href":"https://api.github.com/repos/servo/saltfs/issues/374"},"comments":{"href":"https://api.github.com/repos/servo/saltfs/issues/374/comments"},"review_comments":{"href":"https://api.github.com/repos/servo/saltfs/pulls/374/comments"},"review_comment":{"href":"https://api.github.com/repos/servo/saltfs/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/servo/saltfs/pulls/374/commits"},"statuses":{"href":"https://api.github.com/repos/servo/saltfs/statuses/c66f555aa8aa2b4de3a4d923ceeb27dcb328991c"}}}}
{"actor":{"display_login":"aneeshusa"}}