|
52 | 52 | PYTHON_DEFAULT = "# type python code here\n\n\n\n\n\n" |
53 | 53 |
|
54 | 54 |
|
| 55 | +def echo(text): |
| 56 | + return f'echo $(date -u "+%Y-%m-%d %H:%M:%S,%3N") {text}' |
| 57 | + |
| 58 | + |
55 | 59 | def filter_all_modules(selector, build, dynamic_vars): |
56 | 60 | if selector.split(',', 1)[0] != '*': |
57 | 61 | selector = f'*,{selector}' |
@@ -863,9 +867,13 @@ def _add_zip_generation(self, build, cmd, db_name): |
863 | 867 | filestore_path = '/data/build/datadir/filestore/%s' % db_name |
864 | 868 | filestore_dest = '%s/filestore/' % dump_dir |
865 | 869 | zip_path = '/data/build/logs/%s.zip' % db_name |
| 870 | + cmd.finals.append([echo('### Generating dump')]) |
866 | 871 | cmd.finals.append(['pg_dump', db_name, '>', sql_dest]) |
| 872 | + cmd.finals.append([echo('### Copying filestore')]) |
867 | 873 | cmd.finals.append(['cp', '-r', filestore_path, filestore_dest]) |
| 874 | + cmd.finals.append([echo('### Generaing zip')]) |
868 | 875 | cmd.finals.append(['cd', dump_dir, '&&', 'zip', '-rmq9', zip_path, '*']) |
| 876 | + cmd.finals.append([echo('### Done')]) |
869 | 877 | infos = '{\n "db_name": "%s",\n "build_id": %s,\n "shas": [%s]\n}' % (db_name, build.id, ', '.join(['"%s"' % build_commit.commit_id.dname for build_commit in build.params_id.commit_link_ids])) |
870 | 878 | build._write_file('logs/%s/info.json' % db_name, infos) |
871 | 879 |
|
@@ -1172,22 +1180,23 @@ def _run_restore(self, build, config_data=None): |
1172 | 1180 | cmd = ' && '.join([ |
1173 | 1181 | 'mkdir /data/build/restore', |
1174 | 1182 | 'cd /data/build/restore', |
| 1183 | + echo('### getting archive'), |
1175 | 1184 | 'wget --retry-on-host-error %s' % dump_url, |
1176 | 1185 | 'unzip -q %s' % zip_name, |
1177 | | - 'echo "### restoring filestore"', |
| 1186 | + echo('### restoring filestore'), |
1178 | 1187 | 'mkdir -p /data/build/datadir/filestore/%s' % restore_db_name, |
1179 | 1188 | 'mv filestore/* /data/build/datadir/filestore/%s' % restore_db_name, |
1180 | | - 'echo "### restoring db"', |
| 1189 | + echo('### restoring db'), |
1181 | 1190 | 'createdb %s -T %s' % (restore_db_name, db_template), |
1182 | 1191 | 'psql -q %s < dump.sql' % (restore_db_name), |
1183 | | - 'echo "### performing an analyze"', |
| 1192 | + echo('### performing an analyze'), |
1184 | 1193 | 'psql -q -d %s -c "ANALYZE;"' % restore_db_name, |
1185 | 1194 | 'cd /data/build', |
1186 | | - 'echo "### cleaning"', |
| 1195 | + echo('### cleaning'), |
1187 | 1196 | 'rm -r restore', |
1188 | | - 'echo "### listing modules"', |
| 1197 | + echo('### listing modules'), |
1189 | 1198 | """psql %s -c "select name from ir_module_module where state = 'installed'" -t -A > /data/build/logs/restore_modules_installed.txt""" % restore_db_name, |
1190 | | - 'echo "### restore" "successful"', # two part string to avoid miss grep |
| 1199 | + echo('### restore" "successful'), # two part string to avoid miss grep |
1191 | 1200 | ]) |
1192 | 1201 |
|
1193 | 1202 | return dict(cmd=cmd, network_enabled=True) |
|
0 commit comments