diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2013-06-15 23:40:34 +0000 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2013-06-25 15:31:15 +0100 |
commit | 51f930da27942f1e412a16d87e38c1d6e4d215a4 (patch) | |
tree | 6c040cb0b5f7f00ebfd450811ca207beb46b173e /baserock-system-config-sync/config-sync-tests | |
parent | 160ccc9e93284ad567f476beb32620bb1e0e33b7 (diff) | |
download | tbdiff-51f930da27942f1e412a16d87e38c1d6e4d215a4.tar.gz |
Script to merge and syncronize /etc in different system versions
This commit adds a script to merge and syncronize /etc in different system versions.
The first argument read from command line is the mode, which can be one
of the following:
- test: the purpose of this mode is to test some merge cases. It
receives from the command line v1_dir, vu_dir and v2_dir and
vt_dir. The meaning of these arguments is explained in the
script.
- merge: merges the user changes in /etc in the run system of the
version given as argument
- sync: syncronizes /etc in all run versions, so that this directory is exactly
the same as the version given as argument.
This commit also includes an auxiliary script to mount the systems directory in a
give directory given as argument, and some testing folders to use with
the test mode.
Diffstat (limited to 'baserock-system-config-sync/config-sync-tests')
44 files changed, 446 insertions, 0 deletions
diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1 new file mode 120000 index 0000000..6a93f4f --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/1 @@ -0,0 +1 @@ +afile
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile b/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.dir.symb/vu/afile diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config new file mode 100644 index 0000000..98fa27e --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v1/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config new file mode 100644 index 0000000..4e6a5d3 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/v2/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +#UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config new file mode 100644 index 0000000..c4b25e9 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.etc/vu/sshd_config @@ -0,0 +1,123 @@ +# $OpenBSD: sshd_config,v 1.84 2011/05/23 03:30:07 djm Exp $ + +# This is the sshd server system-wide configuration file. See +# sshd_config(5) for more information. + +# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin + +# The strategy used for options in the default sshd_config shipped with +# OpenSSH is to specify options with their default value where +# possible, but leave them commented. Uncommented options override the +# default value. + +#Port 22 +#AddressFamily any +#ListenAddress 0.0.0.0 +#ListenAddress :: + +# The default requires explicit activation of protocol 1 +#Protocol 2 + +# HostKey for protocol version 1 +#HostKey /etc/ssh/ssh_host_key +# HostKeys for protocol version 2 +#HostKey /etc/ssh/ssh_host_rsa_key +#HostKey /etc/ssh/ssh_host_dsa_key +#HostKey /etc/ssh/ssh_host_ecdsa_key + +# Lifetime and size of ephemeral version 1 server key +#KeyRegenerationInterval 1h +#ServerKeyBits 1024 + +# Logging +# obsoletes QuietMode and FascistLogging +#SyslogFacility AUTH +#LogLevel INFO + +# Authentication: + +#LoginGraceTime 2m +#PermitRootLogin yes +#StrictModes yes +#MaxAuthTries 6 +#MaxSessions 10 + +#RSAAuthentication yes +#PubkeyAuthentication yes + +# The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 +# but this is overridden so installations will only check .ssh/authorized_keys +AuthorizedKeysFile .ssh/authorized_keys + +# For this to work you will also need host keys in /etc/ssh/ssh_known_hosts +#RhostsRSAAuthentication no +# similar for protocol version 2 +#HostbasedAuthentication no +# Change to yes if you don't trust ~/.ssh/known_hosts for +# RhostsRSAAuthentication and HostbasedAuthentication +#IgnoreUserKnownHosts no +# Don't read the user's ~/.rhosts and ~/.shosts files +#IgnoreRhosts yes + +# To disable tunneled clear text passwords, change to no here! +#PasswordAuthentication yes +#PermitEmptyPasswords no + +# Change to no to disable s/key passwords +#ChallengeResponseAuthentication yes + +# Kerberos options +#KerberosAuthentication no +#KerberosOrLocalPasswd yes +#KerberosTicketCleanup yes +#KerberosGetAFSToken no + +# GSSAPI options +#GSSAPIAuthentication no +#GSSAPICleanupCredentials yes + +# Set this to 'yes' to enable PAM authentication, account processing, +# and session processing. If this is enabled, PAM authentication will +# be allowed through the ChallengeResponseAuthentication and +# PasswordAuthentication. Depending on your PAM configuration, +# PAM authentication via ChallengeResponseAuthentication may bypass +# the setting of "PermitRootLogin without-password". +# If you just want the PAM account and session checks to run without +# PAM authentication, then enable this but set PasswordAuthentication +# and ChallengeResponseAuthentication to 'no'. +#UsePAM no + +#AllowAgentForwarding yes +#AllowTcpForwarding yes +#GatewayPorts no +#X11Forwarding no +#X11DisplayOffset 10 +#X11UseLocalhost yes +#PrintMotd yes +#PrintLastLog yes +#TCPKeepAlive yes +UseLogin no +#UsePrivilegeSeparation yes +PermitUserEnvironment yes +#Compression delayed +#ClientAliveInterval 0 +#ClientAliveCountMax 3 +#UseDNS yes +#PidFile /var/run/sshd.pid +#MaxStartups 10 +#PermitTunnel no +#ChrootDirectory none + +# no default banner path +#Banner none + +# override default of no subsystems +Subsystem sftp /usr/lib/openssh/sftp-server + +# Example of overriding settings on a per-user basis +#Match User anoncvs +# X11Forwarding no +# AllowTcpForwarding no +# ForceCommand cvs server + +AcceptEnv LANG LC_* diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v1/1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.dir/v2/1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v1/1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/v2/1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1 new file mode 120000 index 0000000..6a93f4f --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/1 @@ -0,0 +1 @@ +afile
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.regular.symb/vu/afile diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1 new file mode 120000 index 0000000..d09a60b --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl1 @@ -0,0 +1 @@ +../v1f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2 new file mode 120000 index 0000000..d09a60b --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl2 @@ -0,0 +1 @@ +../v1f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3 new file mode 120000 index 0000000..d09a60b --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1/sl3 @@ -0,0 +1 @@ +../v1f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v1f diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1 new file mode 120000 index 0000000..e4b01f1 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl1 @@ -0,0 +1 @@ +../v2f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3 new file mode 120000 index 0000000..e4b01f1 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl3 @@ -0,0 +1 @@ +../v2f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4 new file mode 120000 index 0000000..e4b01f1 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2/sl4 @@ -0,0 +1 @@ +../v2f
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/v2f diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1 new file mode 120000 index 0000000..fcf9fc4 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl1 @@ -0,0 +1 @@ +../vuf
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2 new file mode 120000 index 0000000..fcf9fc4 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl2 @@ -0,0 +1 @@ +../vuf
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4 new file mode 120000 index 0000000..fcf9fc4 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vu/sl4 @@ -0,0 +1 @@ +../vuf
\ No newline at end of file diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades.symblinks/vuf diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1 new file mode 100644 index 0000000..b73be5d --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file1 @@ -0,0 +1,2 @@ +whereami=v1 +version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4 new file mode 100644 index 0000000..9972a7a --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5 new file mode 100644 index 0000000..8fbeda2 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file5 @@ -0,0 +1,2 @@ +whereami=v1,vu +version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7 new file mode 100644 index 0000000..7c1f4fb --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1 new file mode 100644 index 0000000..d579e7b --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v1 +d=1 +e=2 +f=3 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v1/subdir1/subsubdir2/subsubfile4 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file1 new file mode 100644 index 0000000..b73be5d --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file1 @@ -0,0 +1,2 @@ +whereami=v1 +version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file2 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file2 new file mode 100644 index 0000000..9fa9381 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file2 @@ -0,0 +1,2 @@ +whereami=vu +version=vu diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3 new file mode 100644 index 0000000..b1580e3 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file3 @@ -0,0 +1,2 @@ +whereami=vu +version=v2 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4 new file mode 100644 index 0000000..ebc4914 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file4 @@ -0,0 +1,2 @@ +whereami=v1,v2 +version=v2 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file5 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file5 new file mode 100644 index 0000000..8fbeda2 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file5 @@ -0,0 +1,2 @@ +whereami=v1,vu +version=v1 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6 new file mode 100644 index 0000000..e76efb0 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=v2 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7 new file mode 100644 index 0000000..93c46eb --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=v2 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1 new file mode 100644 index 0000000..2462a4f --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/file7.1 @@ -0,0 +1,8 @@ +a=1 +b=2 +c=3 +whereami=v1,vu,v2 +version=v2 +d=1 +e=2 +f=3 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1 new file mode 100644 index 0000000..1cb075e --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subfile1 @@ -0,0 +1,10 @@ +qeq asda d +s +d +a sd +a +d +a +d + +d diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4 new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/v2/subdir1/subsubdir2/subsubfile4 diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2 new file mode 100644 index 0000000..9fa9381 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file2 @@ -0,0 +1,2 @@ +whereami=vu +version=vu diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5 new file mode 100644 index 0000000..eddf4ca --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file5 @@ -0,0 +1,2 @@ +whereami=v1,vu +version=vu diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6 new file mode 100644 index 0000000..9802a97 --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file6 @@ -0,0 +1,2 @@ +whereami=vu,v2 +version=vu diff --git a/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7 b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7 new file mode 100644 index 0000000..24553ad --- /dev/null +++ b/baserock-system-config-sync/config-sync-tests/tests.upgrades/vu/file7 @@ -0,0 +1,2 @@ +whereami=v1,vu,v2 +version=vu |