Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package MirrorCache for openSUSE:Factory
checked in at 2023-04-13 14:10:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/MirrorCache (Old)
and /work/SRC/openSUSE:Factory/.MirrorCache.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MirrorCache"
Thu Apr 13 14:10:59 2023 rev:25 rq:1079051 version:1.057
Changes:
--------
--- /work/SRC/openSUSE:Factory/MirrorCache/MirrorCache.changes 2023-02-16
16:57:13.392295114 +0100
+++ /work/SRC/openSUSE:Factory/.MirrorCache.new.19717/MirrorCache.changes
2023-04-13 14:11:02.404397354 +0200
@@ -1,0 +2,9 @@
+Thu Apr 06 06:31:14 UTC 2023 - Andrii Nikitin <andrii.niki...@suse.com>
+
+- Update to version 1.057:
+ * sql: Optimize lookup for server_project (#369)
+ * Avoid deadlock in minion pubsub code (#371)
+ * Avoid deadlock in cleanup job deleting from folder_diff (#371)
+ * ci: Switch ci container from 15.3 to 15.4 (#370)
+
+-------------------------------------------------------------------
Old:
----
MirrorCache-1.056.obscpio
New:
----
MirrorCache-1.057.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MirrorCache.spec ++++++
--- /var/tmp/diff_new_pack.GkjQ2d/_old 2023-04-13 14:11:02.988400708 +0200
+++ /var/tmp/diff_new_pack.GkjQ2d/_new 2023-04-13 14:11:02.996400754 +0200
@@ -22,7 +22,7 @@
%define main_requires %{assetpack_requires} perl(Carp) perl(DBD::Pg) >= 3.7.4
perl(DBI) >= 1.632 perl(DBIx::Class) >= 0.082801
perl(DBIx::Class::DynamicDefault) perl(DateTime) perl(Encode) perl(Time::Piece)
perl(Time::Seconds) perl(Time::ParseDate) perl(DateTime::Format::Pg)
perl(Exporter) perl(File::Basename) perl(LWP::UserAgent) perl(Mojo::Base)
perl(Mojo::ByteStream) perl(Mojo::IOLoop) perl(Mojo::JSON) perl(Mojo::Pg)
perl(Mojo::URL) perl(Mojo::Util) perl(Mojolicious::Commands)
perl(Mojolicious::Plugin) perl(Mojolicious::Plugin::RenderFile)
perl(Mojolicious::Static) perl(Net::OpenID::Consumer) perl(POSIX)
perl(Sort::Versions) perl(URI::Escape) perl(XML::Writer) perl(base)
perl(constant) perl(diagnostics) perl(strict) perl(warnings) shadow
rubygem(sass) perl(Net::DNS) perl(LWP::Protocol::https) perl(Digest::SHA)
perl(Config::IniFiles)
%define build_requires %{assetpack_requires} rubygem(sass) tidy sysuser-shadow
sysuser-tools
Name: MirrorCache
-Version: 1.056
+Version: 1.057
Release: 0
Summary: WebApp to redirect and manage mirrors
License: GPL-2.0-or-later
++++++ MirrorCache-1.056.obscpio -> MirrorCache-1.057.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.056/.circleci/config.yml
new/MirrorCache-1.057/.circleci/config.yml
--- old/MirrorCache-1.056/.circleci/config.yml 2023-02-09 09:52:35.000000000
+0100
+++ new/MirrorCache-1.057/.circleci/config.yml 2023-04-05 11:42:32.000000000
+0200
@@ -5,10 +5,14 @@
parameters:
db:
type: string
+ experimental:
+ type: string
+ default: ""
machine:
image: ubuntu-2004:202008-01
environment:
MIRRORCACHE_DB_PROVIDER: << parameters.db >>
+ T_EXPERIMENTAL: << parameters.db >>
working_directory: ~/project
steps:
- checkout:
@@ -36,11 +40,20 @@
jobs:
- environ:
db: postgresql
+ name: "t: psql"
+ filters:
+ branches:
+ ignore: gh-pages
+ - environ:
+ db: mariadb
+ name: "t: mariadb"
filters:
branches:
ignore: gh-pages
- environ:
db: mariadb
+ experimental: "1"
+ name: "t: mariadb experimental"
filters:
branches:
ignore: gh-pages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.056/Makefile
new/MirrorCache-1.057/Makefile
--- old/MirrorCache-1.056/Makefile 2023-02-09 09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/Makefile 2023-04-05 11:42:32.000000000 +0200
@@ -15,6 +15,9 @@
test_docker_mariadb:
( cd t/environ; for f in *.sh; do MIRRORCACHE_DB_PROVIDER=mariadb ./$$f
&& continue; echo FAIL $$f; exit 1 ; done )
+test_docker_mariadb_experimental:
+ ( cd t/environ; for f in *.sh; do MIRRORCACHE_DB_PROVIDER=mariadb
T_EXPERIMENTAL=1 ./$$f && continue; echo FAIL $$f; exit 1 ; done )
+
test_systemd:
( cd t/systemd; for f in *.sh; do ./$$f && continue; echo FAIL $$f;
exit 1 ; done )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.056/lib/MirrorCache/Schema/ResultSet/Server.pm
new/MirrorCache-1.057/lib/MirrorCache/Schema/ResultSet/Server.pm
--- old/MirrorCache-1.056/lib/MirrorCache/Schema/ResultSet/Server.pm
2023-02-09 09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/lib/MirrorCache/Schema/ResultSet/Server.pm
2023-04-05 11:42:32.000000000 +0200
@@ -1,4 +1,4 @@
-# Copyright (C) 2020,2021 SUSE LLC
+# Copyright (C) 2020-2023 SUSE LLC
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -25,9 +25,9 @@
sub mirrors_query {
my (
- $self, $country, $region, $folder_id, $file_id, $capability,
- $ipv, $lat, $lng, $avoid_countries, $limit, $avoid_region,
- $schemastrict, $ipvstrict, $vpn
+ $self, $country, $region, $folder_id, $file_id, $project_id,
+ $capability, $ipv, $lat, $lng, $avoid_countries,
+ $limit, $avoid_region, $schemastrict, $ipvstrict, $vpn
) = @_;
$country = '' unless $country;
$region = '' unless $region;
@@ -93,6 +93,13 @@
my $limit1 = 10;
$limit1 = $limit + $limit if $limit > 10;
+ my $join_server_project = "";
+ my $condition_server_project = "";
+ if ($project_id) {
+ $join_server_project = "left join server_project sp on
(project_id,sp.server_id) = ($project_id,s.id) and state < 1";
+ $condition_server_project = "and sp.server_id IS NULL";
+ }
+
my $sql = <<"END_SQL";
select * from (
select x.id as mirror_id,
@@ -128,11 +135,10 @@
join folder_diff_server fds on fd.id = fds.folder_diff_id and
date_trunc('second', fl.dt) <= fds.dt
join server s on fds.server_id = s.id and s.enabled $country_condition
left join folder_diff_file fdf on fdf.file_id = fl.id and
fdf.folder_diff_id = fd.id
- where fd.folder_id = ? and fdf.file_id is NULL
+ $join_server_project
+ where fd.folder_id = ? and fdf.file_id is NULL $condition_server_project
) s
join folder f on f.id = ?
-left join project p on f.path like concat(p.path, '%')
-left join server_project sp on (sp.server_id, sp.project_id)
= (s.id, p.id)
left join server_capability_declaration scd on s.id = scd.server_id and
scd.capability = '$capability' and NOT scd.enabled
left join server_capability_force scf on s.id = scf.server_id and
scf.capability = '$capability'
left join server_capability_declaration scd2 on s.id = scd2.server_id and
scd.capability = '$ipv' and NOT scd.enabled
@@ -141,7 +147,6 @@
left join server_stability stability_schemex on s.id =
stability_schemex.server_id and stability_schemex.capability = '$capabilityx'
left join server_stability stability_ipv on s.id = stability_ipv.server_id
and stability_ipv.capability = '$ipv'
left join server_stability stability_ipvx on s.id =
stability_ipvx.server_id and stability_ipvx.capability = '$ipvx'
-where sp.state is NULL or sp.state > 0
) x
WHERE not_disabled $extra
order by rating_country desc, (dist/100)::int, support_scheme desc,
rating_scheme desc, support_ipv desc, rating_ipv desc, score, random()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.056/lib/MirrorCache/Task/Cleanup.pm
new/MirrorCache-1.057/lib/MirrorCache/Task/Cleanup.pm
--- old/MirrorCache-1.056/lib/MirrorCache/Task/Cleanup.pm 2023-02-09
09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/lib/MirrorCache/Task/Cleanup.pm 2023-04-05
11:42:32.000000000 +0200
@@ -50,7 +50,8 @@
1;
} or $job->note(last_warning_0 => $@, at_0 => datetime_now());
- if ($schema->pg) {
+ eval {
+ if ($schema->pg) {
$sql = <<'END_SQL';
with DiffToDelete as (
select fd.id
@@ -67,20 +68,27 @@
delete from folder_diff where id in
(select * from DiffToDelete)
END_SQL
- } else {
+ $schema->storage->dbh->prepare($sql)->execute();
+ 1;
+ } else {
+ # delete query with will lock a lot of rows, so we split it into
select + deletes
$sql = <<'END_SQL';
-delete fd from folder_diff fd
+select fd.id from folder_diff fd
left join folder_diff_server fds on fds.folder_diff_id = fd.id
where
fds.folder_diff_id is null
and fd.dt < date_sub(CURRENT_TIMESTAMP(3), interval 2 day)
+limit 1000
END_SQL
-}
- eval {
- $schema->storage->dbh->prepare($sql)->execute();
- 1;
+ my $ids_to_delete = $schema->storage->dbh->prepare($sql);
+ $ids_to_delete->execute();
+ my $delete = $schema->storage->dbh->prepare('delete from
folder_diff where id = ?');
+ while (my @row = $ids_to_delete->fetchrow_array()) {
+ my ($id) = @row;
+ $delete->execute($id) if $id;
+ }
+ }
} or $job->note(last_warning_1 => $@, at_1 => datetime_now());
-
# delete rows from server_capability_check to avoid overload
my $sqlservercap;
if ($schema->pg) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.056/lib/MirrorCache/WebAPI/Plugin/Backstage.pm
new/MirrorCache-1.057/lib/MirrorCache/WebAPI/Plugin/Backstage.pm
--- old/MirrorCache-1.056/lib/MirrorCache/WebAPI/Plugin/Backstage.pm
2023-02-09 09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/lib/MirrorCache/WebAPI/Plugin/Backstage.pm
2023-04-05 11:42:32.000000000 +0200
@@ -84,6 +84,7 @@
}
$app->plugin( Minion => { $db => $conn } );
+ $app->minion->backend->no_txn(1) if $db eq 'mysql';
$self->register_tasks;
# Enable the Minion Admin interface under /minion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.056/lib/MirrorCache/WebAPI/Plugin/Project.pm
new/MirrorCache-1.057/lib/MirrorCache/WebAPI/Plugin/Project.pm
--- old/MirrorCache-1.056/lib/MirrorCache/WebAPI/Plugin/Project.pm
2023-02-09 09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/lib/MirrorCache/WebAPI/Plugin/Project.pm
2023-04-05 11:42:32.000000000 +0200
@@ -29,6 +29,7 @@
my ($self, $app) = @_;
$app->helper('mcproject.list' => \&_list);
+ $app->helper('mcproject.get_id' => \&_get_id);
$app->helper('mcproject.list_full' => \&_list_full);
$app->helper('mcproject.redirect' => \&_redirect);
return $self;
@@ -44,13 +45,15 @@
} or $c->log->error(Dumper("Cannot load projects", $@));
for my $p (@projects) {
- my $name = $p->name;
+ my $name = $p->name;
+ my $id = $p->id;
my $alias = $name;
$alias =~ tr/ //ds; # remove spaces
$alias =~ tr/\.//ds; # remove dots
$alias = "c$alias" if $alias =~ /^\d/;
$alias = lc($alias);
$projects_path{$name} = $p->path;
+ $projects_path{$id} = $p->path;
$projects_alias{$name} = $alias;
my $redirect = $p->redirect;
next unless $redirect;
@@ -110,5 +113,16 @@
return '';
}
+sub _get_id {
+ my ($c, $path) = @_;
+ _init_if_needed($c);
+
+ for my $p (@projects) {
+ my $id = $p->id;
+ my $ppath = $projects_path{$id};
+ return $id if (0 == rindex($path, $ppath, 0));
+ }
+ return '';
+}
1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.056/lib/MirrorCache/WebAPI/Plugin/RenderFileFromMirror.pm
new/MirrorCache-1.057/lib/MirrorCache/WebAPI/Plugin/RenderFileFromMirror.pm
--- old/MirrorCache-1.056/lib/MirrorCache/WebAPI/Plugin/RenderFileFromMirror.pm
2023-02-09 09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/lib/MirrorCache/WebAPI/Plugin/RenderFileFromMirror.pm
2023-04-05 11:42:32.000000000 +0200
@@ -144,11 +144,14 @@
}
my (@mirrors_country, @mirrors_region, @mirrors_rest);
-
- _collect_mirrors($dm, \@mirrors_country, \@mirrors_region,
\@mirrors_rest, $file->{id}, $folder_id);
+ my $project_id = $c->mcproject->get_id($dirname);
+ _collect_mirrors($dm, \@mirrors_country, \@mirrors_region,
\@mirrors_rest, $file->{id}, $folder_id, $project_id);
# add mirrors that have realpath
- _collect_mirrors($dm, \@mirrors_country, \@mirrors_region,
\@mirrors_rest, $file->{id}, $realfolder_id) if $realfolder_id &&
$realfolder_id != $folder_id;
+ if ($realfolder_id && $realfolder_id != $folder_id) {
+ my $realproject_id = $c->mcproject->get_id($realdirname);
+ _collect_mirrors($dm, \@mirrors_country, \@mirrors_region,
\@mirrors_rest, $file->{id}, $realfolder_id, $realproject_id);
+ }
my $mirror;
$mirror = $mirrors_country[0] if @mirrors_country;
$mirror = $mirrors_region[0] if !$mirror && @mirrors_region;
@@ -695,7 +698,7 @@
}
sub _collect_mirrors {
- my ($dm, $mirrors_country, $mirrors_region, $mirrors_rest, $file_id,
$folder_id) = @_;
+ my ($dm, $mirrors_country, $mirrors_region, $mirrors_rest, $file_id,
$folder_id, $project_id) = @_;
my $country = $dm->country;
my $region = $dm->region;
@@ -712,8 +715,8 @@
my $m;
$m = $rs->mirrors_query(
- $country, $region, $folder_id, $file_id, $scheme,
- $ipv, $lat, $lng, $avoid_countries, $limit, 0,
+ $country, $region, $folder_id, $file_id, $project_id,
+ $scheme, $ipv, $lat, $lng, $avoid_countries, $limit, 0,
!$mirrorlist, $ipvstrict, $vpn
) if $country;
@@ -725,8 +728,8 @@
push @avoid_countries, @$avoid_countries if $avoid_countries &&
scalar(@$avoid_countries);
push @avoid_countries, $country if ($country and !(grep { $country eq
$_ } @avoid_countries));
$m = $rs->mirrors_query(
- $country, $region, $folder_id, $file_id, $scheme,
- $ipv, $lat, $lng, \@avoid_countries, $limit, 0,
+ $country, $region, $folder_id, $file_id, $project_id,
+ $scheme, $ipv, $lat, $lng, \@avoid_countries, $limit, 0,
!$mirrorlist, $ipvstrict, $vpn
);
my $found_more;
@@ -743,8 +746,8 @@
$mirrorlist
) {
$m = $rs->mirrors_query(
- $country, $region, $folder_id, $file_id, $scheme,
- $ipv, $lat, $lng, $avoid_countries, $limit, 1,
+ $country, $region, $folder_id, $file_id, $project_id,
+ $scheme, $ipv, $lat, $lng, $avoid_countries, $limit, 1,
!$mirrorlist, $ipvstrict, $vpn
);
my $found_more;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.056/t/environ/14-project.sh
new/MirrorCache-1.057/t/environ/14-project.sh
--- old/MirrorCache-1.056/t/environ/14-project.sh 2023-02-09
09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/t/environ/14-project.sh 2023-04-05
11:42:32.000000000 +0200
@@ -72,4 +72,14 @@
$mc/curl -s /rest/project/proj1/mirror_list | grep -E
'{"current":"?1"?,"server_id":"?1"?,"url":"127.0.0.1:1294"},{"current":"?1"?,"server_id":"?3"?,"url":"127.0.0.1:1314"},{"current":"?0"?,"server_id":"?4"?,"url":"127.0.0.1:1284"},{"current":"?0"?,"server_id":"?2"?,"url":"127.0.0.1:1304"}'
+echo request from jp should be redirected to ap4
+$mc/curl -I /download/project2/folder1/file1.1.dat?COUNTRY=jp | grep
$($ap4/print_address)
+
+echo now disable proj 2 on ap4 - redirect should change
+$mc/sql 'insert into server_project(server_id, project_id, state) select 5, 2,
0';
+echo request from jp shouldnt be redirected to ap4 anymore, because we have
disabled /project2 on it
+rc=0
+$mc/curl -I /download/project2/folder1/file1.1.dat?COUNTRY=jp | grep
$($ap4/print_address) || rc=$?
+test $rc -gt 0
+
echo success
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.056/t/lib/Dockerfile.environ.mariadb
new/MirrorCache-1.057/t/lib/Dockerfile.environ.mariadb
--- old/MirrorCache-1.056/t/lib/Dockerfile.environ.mariadb 2023-02-09
09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/t/lib/Dockerfile.environ.mariadb 2023-04-05
11:42:32.000000000 +0200
@@ -1,11 +1,11 @@
-FROM opensuse/leap:15.3
+FROM opensuse/leap:15.4
ENV container docker
ENV LANG en_US.UTF-8
RUN sed -i
's,http://download.opensuse.org,http://mirrorcache.opensuse.org/download,g'
/etc/zypp/repos.d/*repo
-RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/openSUSE_Leap_15.3
mc
-RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/devel:/languages:/perl/openSUSE_Leap_15.3
perl
+RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4
mc
+RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/devel:/languages:/perl/15.4 perl
RUN zypper --gpg-auto-import-keys ref
# install MirrorCache here to fetch all dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.056/t/lib/Dockerfile.environ.mariadb.experimental
new/MirrorCache-1.057/t/lib/Dockerfile.environ.mariadb.experimental
--- old/MirrorCache-1.056/t/lib/Dockerfile.environ.mariadb.experimental
1970-01-01 01:00:00.000000000 +0100
+++ new/MirrorCache-1.057/t/lib/Dockerfile.environ.mariadb.experimental
2023-04-05 11:42:32.000000000 +0200
@@ -0,0 +1,41 @@
+FROM opensuse/leap:15.4
+ENV container docker
+
+ENV LANG en_US.UTF-8
+
+RUN sed -i
's,http://download.opensuse.org,http://mirrorcache.opensuse.org/download,g'
/etc/zypp/repos.d/*repo
+RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4
mc
+RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/devel:/languages:/perl/15.4 perl
+RUN zypper ar -f https://mirror.mariadb.org/yum/11.0.1/sles/15.4/x86_64 mariadb
+RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB
+RUN zypper --gpg-auto-import-keys ref
+
+# install MirrorCache here to fetch all dependencies
+RUN zypper -vvv -n install MirrorCache perl-MaxMind-DB-Reader
perl-Mojolicious-Plugin-ClientIP \
+ vim MariaDB-server MariaDB-client curl sudo git-core wget tar m4 make
rsync \
+ apache2 perl-Digest-MD4 tidy nginx bbe perl-DBD-mysql perl-Mojo-mysql
perl-Minion-Backend-mysql perl-DateTime-HiRes \
+ perl-Config-IniFiles
+
+# optional dependencies used in testing
+RUN zypper -vvv -n install perl-Geo-IP2Location perl-Inline-C gcc
perl-DateTime-Format-MySQL libxml2-tools
+
+RUN zypper -vvv -n install MariaDB-server-compat MariaDB-client-compat
+
+# this hack is needed because old nginx versions cannot run as non-root
+RUN bbe -e 's,/var/log/nginx/error.log,/tmp/log_nginx_error.log,'
/usr/sbin/nginx > /usr/sbin/nginx.hacked
+RUN mv /usr/sbin/nginx.hacked /usr/sbin/nginx
+RUN chmod +x /usr/sbin/nginx
+
+WORKDIR /opt
+RUN echo 2
+RUN git clone https://github.com/andrii-suse/environ
+WORKDIR /opt/environ
+RUN make install
+WORKDIR /opt/project
+ENV TZ UTC
+ENV MOJO_PUBSUB_EXPERIMENTAL 1
+
+
+
+
+ENTRYPOINT ["/usr/bin/tail", "-f", "/dev/null"]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.056/t/lib/Dockerfile.environ.postgresql
new/MirrorCache-1.057/t/lib/Dockerfile.environ.postgresql
--- old/MirrorCache-1.056/t/lib/Dockerfile.environ.postgresql 2023-02-09
09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/t/lib/Dockerfile.environ.postgresql 2023-04-05
11:42:32.000000000 +0200
@@ -1,10 +1,10 @@
-FROM opensuse/leap:15.3
+FROM opensuse/leap:15.4
ENV container docker
ENV LANG en_US.UTF-8
RUN sed -i
's,http://download.opensuse.org,http://mirrorcache.opensuse.org/download,g'
/etc/zypp/repos.d/*repo
-RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/openSUSE_Leap_15.3
mc
+RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4
mc
RUN zypper --gpg-auto-import-keys ref
# install MirrorCache here to fetch all dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.056/t/lib/Dockerfile.systemd.mariadb
new/MirrorCache-1.057/t/lib/Dockerfile.systemd.mariadb
--- old/MirrorCache-1.056/t/lib/Dockerfile.systemd.mariadb 2023-02-09
09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/t/lib/Dockerfile.systemd.mariadb 2023-04-05
11:42:32.000000000 +0200
@@ -1,11 +1,11 @@
-FROM registry.opensuse.org/opensuse/leap:15.3
+FROM registry.opensuse.org/opensuse/leap:15.4
ENV container docker
ENV LANG en_US.UTF-8
RUN sed -i
's,http://download.opensuse.org,https://mirrorcache.opensuse.org/download,g'
/etc/zypp/repos.d/*repo
-RUN zypper ar -f
https://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/openSUSE_Leap_15.3
mc
-RUN zypper ar -f
https://download.opensuse.org/repositories/devel:/languages:/perl/openSUSE_Leap_15.3
perl
+RUN zypper ar -f
https://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4
mc
+RUN zypper ar -f
https://download.opensuse.org/repositories/devel:/languages:/perl/15.4 perl
RUN zypper --gpg-auto-import-keys ref
# install MirrorCache here to fetch all dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/MirrorCache-1.056/t/lib/Dockerfile.systemd.postgresql
new/MirrorCache-1.057/t/lib/Dockerfile.systemd.postgresql
--- old/MirrorCache-1.056/t/lib/Dockerfile.systemd.postgresql 2023-02-09
09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/t/lib/Dockerfile.systemd.postgresql 2023-04-05
11:42:32.000000000 +0200
@@ -1,10 +1,10 @@
-FROM registry.opensuse.org/opensuse/leap:15.3
+FROM registry.opensuse.org/opensuse/leap:15.4
ENV container docker
ENV LANG en_US.UTF-8
RUN sed -i
's,http://download.opensuse.org,http://mirrorcache.opensuse.org/download,g'
/etc/zypp/repos.d/*repo
-RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/openSUSE_Leap_15.3
mc
+RUN zypper ar -f
http://mirrorcache.opensuse.org/repositories/openSUSE:infrastructure:MirrorCache/15.4
mc
RUN zypper --gpg-auto-import-keys ref
# install MirrorCache here to fetch all dependencies
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.056/t/lib/environ/mc/source/_exec.m4
new/MirrorCache-1.057/t/lib/environ/mc/source/_exec.m4
--- old/MirrorCache-1.056/t/lib/environ/mc/source/_exec.m4 2023-02-09
09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/t/lib/environ/mc/source/_exec.m4 2023-04-05
11:42:32.000000000 +0200
@@ -3,7 +3,7 @@
set -a
source __workdir/conf.env
set +a
-__workdir/db/status >& /dev/null || __workdir/db/start
+__workdir/db/status >& /dev/null || __workdir/db/start
"--transaction-isolation=read-committed"
[ -e __workdir/db/sql_mc_test ] || __workdir/db/create_db mc_test
if test "${MIRRORCACHE_DAEMON:-}" == 1 ; then
perl __srcdir/script/mirrorcache-daemon >> __workdir/.cout 2>>
__workdir/.cerr &
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/MirrorCache-1.056/t/lib/test-in-container-environ.sh
new/MirrorCache-1.057/t/lib/test-in-container-environ.sh
--- old/MirrorCache-1.056/t/lib/test-in-container-environ.sh 2023-02-09
09:52:35.000000000 +0100
+++ new/MirrorCache-1.057/t/lib/test-in-container-environ.sh 2023-04-05
11:42:32.000000000 +0200
@@ -37,7 +37,7 @@
basename=$(basename "$testcase")
basename=${basename,,}
basename=${basename//:/_}
-ident=mc.envtest$dbprovider
+ident=mc.envtest$dbprovider${T_EXPERIMENTAL:-""}
containername="$ident.${basename,,}"
docker_info="$(docker info >/dev/null 2>&1)" || {
@@ -45,7 +45,12 @@
(exit 1)
}
-docker build -t $ident.image -f $thisdir/Dockerfile.environ.$dbprovider
$thisdir
+dockerfile=$thisdir/Dockerfile.environ.$dbprovider
+
+test "${T_EXPERIMENTAL:-''}" != 1 || dockerfile=$dockerfile.experimental
+
+
+docker build -t $ident.image -f $dockerfile $thisdir
docker rm -f "$containername" >&/dev/null || :
++++++ MirrorCache.obsinfo ++++++
--- /var/tmp/diff_new_pack.GkjQ2d/_old 2023-04-13 14:11:03.336402706 +0200
+++ /var/tmp/diff_new_pack.GkjQ2d/_new 2023-04-13 14:11:03.340402729 +0200
@@ -1,5 +1,5 @@
name: MirrorCache
-version: 1.056
-mtime: 1675932755
-commit: 5fa14eb5b8ef788ec3f70055537710294b79982b
+version: 1.057
+mtime: 1680687752
+commit: ebc5c1979916df7a82a430f0766f706a3296282f
