Produced by Araxis Merge on 10/2/2017 1:40:11 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | chef-repo.zip\chef-repo\third_party_cookbooks\build-essential | .kitchen.cloud.yml | Wed Jun 3 20:37:07 2015 UTC |
| 2 | chef-repo.zip\chef-repo\third_party_cookbooks\build-essential | .kitchen.cloud.yml | Mon Oct 2 12:43:44 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 4 | 324 |
| Changed | 3 | 6 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | #<% requir e 'kitchen -sync' %> | |
| 2 | --- | |
| 3 | driver_con fig: | |
| 4 | digitalo cean_clien t_id: <%= ENV['DIGIT AL_OCEAN_C LIENT_ID'] %> | |
| 5 | google_c lient_emai l: <%= ENV ['GOOGLE_C LIENT_EMAI L'] %> | |
| 6 | google_k ey_locatio n: <%= ENV ['GOOGLE_K EY_LOCATIO N'] %> | |
| 7 | google_p roject: <% = ENV['GOO GLE_PROJEC T'] %> | |
| 8 | joyent_u sername: < %= ENV['SD C_CLI_ACCO UNT'] %> | |
| 9 | joyent_k eyfile: <% = ENV['SDC _CLI_IDENT ITY'] %> | |
| 10 | joyent_k eyname: <% = ENV['SDC _CLI_KEY_I D'] %> | |
| 11 | joyent_u rl: <%= EN V['SDC_CLI _URL'] %> | |
| 12 | aws_acce ss_key_id: <%= ENV[' AWS_ACCESS _KEY_ID'] %> | |
| 13 | aws_secr et_access_ key: <%= E NV['AWS_SE CRET_ACCES S_KEY'] %> | |
| 14 | aws_ssh_ key_id: <% = ENV['AWS _KEYPAIR_N AME'] %> | |
| 15 | flavor_i d: <%= ENV ['EC2_FLAV OR_ID'] %> | |
| 16 | availabi lity_zone: <%= ENV[' AWS_AVAILA BILITY_ZON E'] %> | |
| 17 | ||
| 18 | provisione r: | |
| 19 | name: ch ef_zero | |
| 20 | # requir e_chef_omn ibus: 11.1 6.4 | |
| 21 | require_ chef_omnib us: 12.0.3 | |
| 22 | ||
| 23 | platforms: | |
| 24 | - name: ce ntos-5.8 | |
| 25 | driver_p lugin: dig ital_ocean | |
| 26 | driver_c onfig: | |
| 27 | size: 2gb | |
| 28 | image: centos-5- 8-x64 | |
| 29 | region : <%= ENV[ 'DIGITAL_O CEAN_REGIO N'] %> | |
| 30 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 31 | ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH'] %> | |
| 32 | ||
| 33 | - name: ce ntos-6.5 | |
| 34 | driver_p lugin: dig ital_ocean | |
| 35 | driver_c onfig: | |
| 36 | size: 2gb | |
| 37 | image: centos-6- 5-x64 | |
| 38 | region : <%= ENV[ 'DIGITAL_O CEAN_REGIO N'] %> | |
| 39 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 40 | ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH'] %> | |
| 41 | ||
| 42 | - name: ce ntos-7.0 | |
| 43 | driver_p lugin: dig ital_ocean | |
| 44 | driver_c onfig: | |
| 45 | size: 2gb | |
| 46 | image: centos-7- 0-x64 | |
| 47 | region : <%= ENV[ 'DIGITAL_O CEAN_REGIO N'] %> | |
| 48 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 49 | ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH'] %> | |
| 50 | ||
| 51 | - name: am azon-2014. 09 | |
| 52 | driver_p lugin: ec2 | |
| 53 | driver_c onfig: | |
| 54 | image_ id: ami-9a 6ed3f2 | |
| 55 | username: DNS | |
| 56 | ssh_ke y: <%= ENV ['EC2_SSH_ KEY_PATH'] %> | |
| 57 | ||
| 58 | # - name: redhat-6.5 | |
| 59 | # driver _plugin: e c2 | |
| 60 | # driver _config: | |
| 61 | # imag e_id: ami- 8d756fe4 | |
| 62 | # username: DNS | |
| 63 | # ssh_ key: <%= E NV['EC2_SS H_KEY_PATH '] %> | |
| 64 | # run_li st: | |
| 65 | # - reci pe[selinux ::disabled ] | |
| 66 | ||
| 67 | - name: re dhat-7.0 | |
| 68 | driver_p lugin: ec2 | |
| 69 | driver_c onfig: | |
| 70 | image_ id: ami-a8 d369c0 | |
| 71 | username: DNS | |
| 72 | ssh_ke y: <%= ENV ['EC2_SSH_ KEY_PATH'] %> | |
| 73 | run_list : | |
| 74 | - recipe [selinux:: disabled] | |
| 75 | ||
| 76 | - name: fe dora-20 | |
| 77 | driver_p lugin: dig ital_ocean | |
| 78 | driver_c onfig: | |
| 79 | size: 2gb | |
| 80 | image: fedora-20 -x64 | |
| 81 | region : <%= ENV[ 'DIGITAL_O CEAN_REGIO N'] %> | |
| 82 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 83 | ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH'] %> | |
| 84 | ||
| 85 | - name: su se-11.3 | |
| 86 | driver_p lugin: ec2 | |
| 87 | driver_c onfig: | |
| 88 | image_ id: ami-e8 084981 | |
| 89 | userna me: root | |
| 90 | ssh_ke y: <%= ENV ['EC2_SSH_ KEY_PATH'] %> | |
| 91 | ||
| 92 | - name: de bian-7.0 | |
| 93 | driver_p lugin: gce | |
| 94 | driver_c onfig: | |
| 95 | image_ name: debi an-7-wheez y-v2013112 0 | |
| 96 | zone: <%= ENV['G CE_ZONE'] %> | |
| 97 | area: <%= ENV['G CE_AREA'] %> | |
| 98 | networ k: <%= ENV ['GCE_NETW ORK'] %> | |
| 99 | userna me: <%= EN V['GCE_USE RNAME'] %> | |
| 100 | public _key_path: <%= ENV[' GCE_PUBLIC _KEY_PATH' ] %> | |
| 101 | ssh_ke y: <%= ENV ['GCE_SSH_ KEY_PATH'] %> | |
| 102 | run_list : | |
| 103 | - recipe [apt] | |
| 104 | ||
| 105 | - name: ub untu-10.04 | |
| 106 | driver_p lugin: dig ital_ocean | |
| 107 | driver_c onfig: | |
| 108 | size: 2gb | |
| 109 | image: ubuntu-10 -04-x64 | |
| 110 | region : <%= ENV[ 'DIGITAL_O CEAN_REGIO N'] %> | |
| 111 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 112 | ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH'] %> | |
| 113 | run_list : | |
| 114 | - recipe [apt] | |
| 115 | ||
| 116 | - name: ub untu-12.04 | |
| 117 | driver_p lugin: dig ital_ocean | |
| 118 | driver_c onfig: | |
| 119 | size: 2gb | |
| 120 | image: ubuntu-12 -04-x64 | |
| 121 | region : <%= ENV[ 'DIGITAL_O CEAN_REGIO N'] %> | |
| 122 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 123 | ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH'] %> | |
| 124 | run_list : | |
| 125 | - recipe [apt] | |
| 126 | ||
| 127 | - name: ub untu-14.04 | |
| 128 | driver_p lugin: dig ital_ocean | |
| 129 | driver_c onfig: | |
| 130 | size: 2gb | |
| 131 | image: ubuntu-14 -04-x64 | |
| 132 | region : <%= ENV[ 'DIGITAL_O CEAN_REGIO N'] %> | |
| 133 | ssh_ke y_ids: <%= ENV['DIGI TAL_OCEAN_ SSH_KEY_ID S'] %> | |
| 134 | ssh_ke y: <%= ENV ['DIGITAL_ OCEAN_SSH_ KEY_PATH'] %> | |
| 135 | run_list : | |
| 136 | - recipe [apt] | |
| 137 | ||
| 138 | # - name: omnios-151 006 | |
| 139 | # driver _plugin: e c2 | |
| 140 | # driver _config: | |
| 141 | # imag e_id: ami- 35eb835c | |
| 142 | # flav or_id: m3. large | |
| 143 | # user name: root | |
| 144 | # ssh_ key: <%= E NV['EC2_SS H_KEY_PATH '] %> | |
| 145 | # run_li st: | |
| 146 | # - reci pe[ips-omn iti] | |
| 147 | ||
| 148 | # - name: smartos-14 .3.0 | |
| 149 | # driver _plugin: j oyent | |
| 150 | # driver _config: | |
| 151 | # joye nt_image_i d: 62f148f 8-6e84-11e 4-82c5-efc a60348b9f | |
| 152 | # joye nt_flavor_ id: g3-sta ndard-4-sm artos | |
| 153 | # user name: root | |
| 154 | # ssh_ key: <%= E NV['SDC_CL I_IDENTITY '] %> | |
| 155 | # busser : | |
| 156 | # ruby _bindir: ' /opt/local /bin/' | |
| 157 | # provis ioner: | |
| 158 | # sudo : false | |
| 159 | # chef _omnibus_u rl: https: //raw.gith ub.com/tes t-kitchen/ kitchen-jo yent/maste r/scripts/ install-sm artos.sh | |
| 160 | ||
| 161 | suites: | |
| 162 | - name: de fault | |
| 163 | run_list : | |
| 164 | - recipe [build-ess ential::de fault] | |
| 165 | attribut es: {} |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.