Branch: refs/heads/master
Home: https://github.com/openSUSE/open-build-service
Commit: 481035d9de82eff08a555d79e842c2c33e52f629
https://github.com/openSUSE/open-build-service/commit/481035d9de82eff08a555d...
Author: Björn Geuken
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M src/api/db/structure.sql
M src/api/lib/tasks/databases.rake
Log Message:
-----------
Revert "Merge pull request #3167 from bgeuken/remove_custom_structure_dump"
This reverts commit aa9d0a6e78bb947a452c6d3db5542844914b2f75, reversing
changes made to 4377556551f8157b286bb35f730a39ea8fbbb2e7.
In our package builds we run a db structure dump comparison (script/api_test_in_spec.sh)
that fails now because timestamps and alike don't match with the
expected structure.sql.
We have to first change / remove this script.
=========
[ 348s] ERROR: Migration is producing a different structure.sql
[ 348s] --- db/structure.sql 2017-06-01 13:16:34.064000000 +0000
[ 348s] +++ db/structure.sql.git 2017-06-01 13:16:19.536000000 +0000
[ 348s] @@ -1,8 +1,8 @@
[ 348s] --- MySQL dump 10.15 Distrib 10.0.27-MariaDB, for Linux (x86_64)
[ 349s] +-- MySQL dump 10.15 Distrib 10.0.29-MariaDB, for Linux (x86_64)
[ 349s] --
[ 349s] --- Host: localhost Database: api_25
[ 349s] +-- Host: localhost Database: localhost
[ 349s] -- ------------------------------------------------------
[ 349s] --- Server version 10.0.27-MariaDB
[ 349s] +-- Server version 10.0.29-MariaDB
[ 349s]
[ 349s] /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
[ 349s] /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
[ 349s] @@ -1820,7 +1820,7 @@
[ 349s] /*!40101 SET character_set_client = @saved_cs_client */;
[ 349s]
[ 349s] --
[ 349s] --- Dumping routines for database 'api_25'
[ 349s] +-- Dumping routines for database 'api_development'
[ 349s] --
[ 349s] /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
[ 349s]
[ 349s] @@ -1832,7 +1832,7 @@
[ 349s] /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
[ 349s] /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
[ 349s]
[ 349s] --- Dump completed on 2017-06-01 13:16:34
[ 349s] +-- Dump completed on 2017-05-31 16:16:33
[ 349s] INSERT INTO schema_migrations (version) VALUES
[ 349s] ('1'),
[ 349s] ('20140210114542'),
[ 349s] Makefile:65: recipe for target 'test_unit' failed
[ 349s] make: *** [test_unit] Error 1
[ 349s] make: Leaving directory '/home/abuild/rpmbuild/BUILD/open-build-service-2.8.51.git20170601.71c89f5/src/api'
Commit: 809fef4ead6ec810a5221fd2c179f4b28944f5e6
https://github.com/openSUSE/open-build-service/commit/809fef4ead6ec810a5221f...
Author: Henne Vogelsang
Date: 2017-06-01 (Thu, 01 Jun 2017)
Changed paths:
M src/api/db/structure.sql
M src/api/lib/tasks/databases.rake
Log Message:
-----------
Merge pull request #3175 from bgeuken/revert_structure_dump_change
Revert "Merge pull request #3167 from bgeuken/remove_custom_structure…
Compare: https://github.com/openSUSE/open-build-service/compare/71c89f580b32...809fef...
Henne Vogelsang