uricp 0.0.36 → 0.0.37

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fdf0146a9045790fac899c6fd9dd0a2de8d77d8ed5f6e8d652c994ae12bcd5f7
4
- data.tar.gz: 6c5b2e4b0f7b210f74f56b0fca2a6ab1ada244110d82f2dba06fab7bd2aefef8
3
+ metadata.gz: a0432fbf510461f29163cffb6246b417c2aafefdb0b17d01a9cdb3276a285823
4
+ data.tar.gz: 2f2d65d8de777e59eb1d0ea8ae5a37e2d41061dc8d8ca8ba62ad6d5d36ad8ff0
5
5
  SHA512:
6
- metadata.gz: e7d1e3ed8d8eda28f56714cf79785a28d2b0733c1f16fe6e2c3d30e4a30fcd6f8f046e275776f7243f43179b281c6966211c1f32192c446a85df6e9453e1e2ee
7
- data.tar.gz: d389fd727dde31846e9cdd0f18b0eddb2cba12ef476fdd61819a271caf1bf77afb83f96ba83c9f21c3433f9fb1adaf412a77914028aee416c94d3ac37e527072
6
+ metadata.gz: e414dd96633873aa1264f4e619daab69f477429a0ba1d8e3c29c01964cfcfc0f3b53832181716c7f687066d473854aed5055329dd69bdad510dcbb7af7840c0e
7
+ data.tar.gz: 7d21dcfe38d979ef17f85c1afa1b35017a8def5e65d6363878da440330c761b4cf3dc694600467d64b7ab014a6f79e194bcac3090c43db6908d98fb1ba33098a
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- uricp (0.0.36)
4
+ uricp (0.0.37)
5
5
  childprocess (~> 1.0)
6
6
  filesize (= 0.0.2)
7
7
  methadone (~> 2.0.2)
data/Jenkinsfile CHANGED
@@ -40,30 +40,6 @@ pipeline {
40
40
  }
41
41
  }
42
42
  }
43
- stage("CentOS 7") {
44
- agent {
45
- dockerfile {
46
- dir 'centos7'
47
- label "docker"
48
- additionalBuildArgs '--build-arg CEPH_MON --build-arg RBD_USR --build-arg RBD_PSW'
49
- }
50
- }
51
- steps {
52
- sh 'rbd --id "${RBD_USR}" ls servers'
53
- sh 'bundle install --deployment'
54
- sh 'bundle exec rake features:new_qemu'
55
- }
56
- post {
57
- always {
58
- sh 'bundle exec rake features:clean'
59
- }
60
- failure {
61
- mail to: 'sysadmin@brightbox.co.uk',
62
- subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
63
- body: "${env.BUILD_URL}"
64
- }
65
- }
66
- }
67
43
  stage("Focal, Ruby 2.7.0") {
68
44
  agent {
69
45
  dockerfile {
@@ -88,50 +64,6 @@ pipeline {
88
64
  }
89
65
  }
90
66
  }
91
- stage("Xenial, Ruby 2.3.1") {
92
- agent {
93
- dockerfile {
94
- dir 'xenial'
95
- label "docker"
96
- }
97
- }
98
- steps {
99
- sh 'bundle install --deployment'
100
- sh 'bundle exec rake features:new_qemu'
101
- }
102
- post {
103
- always {
104
- sh 'bundle exec rake features:clean'
105
- }
106
- failure {
107
- mail to: 'sysadmin@brightbox.co.uk',
108
- subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
109
- body: "${env.BUILD_URL}"
110
- }
111
- }
112
- }
113
- stage("Bionic, Ruby 2.5.1") {
114
- agent {
115
- dockerfile {
116
- dir 'bionic'
117
- label "docker"
118
- }
119
- }
120
- steps {
121
- sh 'bundle install --deployment'
122
- sh 'bundle exec rake features:new_qemu'
123
- }
124
- post {
125
- always {
126
- sh 'bundle exec rake features:clean'
127
- }
128
- failure {
129
- mail to: 'sysadmin@brightbox.co.uk',
130
- subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
131
- body: "${env.BUILD_URL}"
132
- }
133
- }
134
- }
135
67
  }
136
68
  post {
137
69
  failure {
@@ -1,12 +1,13 @@
1
- FROM almalinux:8
1
+ FROM almalinux:8.9
2
2
  MAINTAINER support@brightbox.co.uk
3
3
 
4
4
  RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
5
5
  RUN dnf -y install dnf-plugins-core
6
- RUN dnf config-manager --add-repo https://repo.almalinux.org/almalinux/8/devel/almalinux-devel.repo
7
- RUN echo "8-stream" > /etc/dnf/vars/stream
8
- RUN dnf -y update
9
- RUN dnf config-manager --set-enabled powertools,devel
6
+ #RUN dnf config-manager --add-repo https://repo.almalinux.org/almalinux/8/devel/almalinux-devel.repo
7
+ #RUN echo "8-stream" > /etc/dnf/vars/stream
8
+ #RUN dnf -y update
9
+ #RUN dnf config-manager --set-enabled powertools,devel
10
+ RUN dnf config-manager --set-enabled powertools
10
11
  RUN dnf -y group install "Development Tools"
11
12
  RUN dnf -y install https://www.rdoproject.org/repos/rdo-release.el8.rpm
12
13
  RUN dnf -y install \
@@ -80,6 +80,26 @@ Feature: Manipulate file images in ceph
80
80
  rbd clone --id libvirt 'servers/freedos.qcow2@base' 'servers/srv-testy'
81
81
  """
82
82
 
83
+ Scenario: file URI to rbd via cache
84
+ Given a correctly initialised cache at "/tmp/uricp"
85
+ When I successfully run `uricp --dry-run --target-format 'raw' --cache '/tmp/uricp' --max-cache '1073741824B' 'file:///dev/servers/srv-testy-vol_frozen' 'rbd:/servers/srv-testy-vol'`
86
+ And the output should contain:
87
+ """
88
+ rbd import --no-progress --id libvirt - <'/dev/servers/srv-testy-vol_frozen' 'servers/srv-testy-vol'
89
+ """
90
+ And the output should not contain:
91
+ """
92
+ snap create
93
+ """
94
+ And the output should not contain:
95
+ """
96
+ snap protect
97
+ """
98
+ And the output should not contain:
99
+ """
100
+ rbd clone
101
+ """
102
+
83
103
  Scenario: rbd to rbd - no cache
84
104
  Given a correctly initialised cache at "/tmp/uricp"
85
105
  When I successfully run `uricp --dry-run rbd:///servers/img-testy rbd:///servers/srv-testy`
@@ -23,9 +23,9 @@ module Uricp::Strategy
23
23
 
24
24
  def proposal
25
25
  @proposed_options = options.dup
26
- @proposed_options['from_uri'] = URI.join('file:///', cache_file) unless file_source?
27
- if to.scheme == 'rbd'
28
- @proposed_options['rbd_cache_name'] = rbd_cache_image_spec(to)
26
+ unless file_source?
27
+ @proposed_options['from_uri'] = URI.join('file:///', cache_file)
28
+ @proposed_options['rbd_cache_name'] = rbd_cache_image_spec(to) if to.scheme == 'rbd'
29
29
  end
30
30
  @proposed_options.delete('cache')
31
31
  @proposed_options.delete('cache_name')
data/lib/uricp/version.rb CHANGED
@@ -1,6 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Uricp
4
- VERSION = '0.0.36'
4
+ VERSION = '0.0.37'
5
5
  DEFAULT_SEGMENT_SIZE = '5 GiB'
6
6
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: uricp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.36
4
+ version: 0.0.37
5
5
  platform: ruby
6
6
  authors:
7
7
  - Neil Wilson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-12-08 00:00:00.000000000 Z
11
+ date: 2024-03-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aruba
@@ -170,8 +170,6 @@ files:
170
170
  - almalinux8/Dockerfile
171
171
  - bin/segment_upload
172
172
  - bin/uricp
173
- - bionic/Dockerfile
174
- - centos7/Dockerfile
175
173
  - cucumber.yml
176
174
  - features/auth_download.feature
177
175
  - features/cacheable_from_uri.feature
@@ -225,7 +223,6 @@ files:
225
223
  - lib/uricp/uri_strategy.rb
226
224
  - lib/uricp/version.rb
227
225
  - uricp.gemspec
228
- - xenial/Dockerfile
229
226
  homepage: ''
230
227
  licenses:
231
228
  - gplv3
@@ -245,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
245
242
  - !ruby/object:Gem::Version
246
243
  version: '0'
247
244
  requirements: []
248
- rubygems_version: 3.1.2
245
+ rubygems_version: 3.3.5
249
246
  signing_key:
250
247
  specification_version: 4
251
248
  summary: Copy one URL to another with optional cacheing
data/bionic/Dockerfile DELETED
@@ -1,21 +0,0 @@
1
- FROM ubuntu:bionic
2
- MAINTAINER support@brightbox.co.uk
3
-
4
- RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
5
-
6
- RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq software-properties-common
7
-
8
- #RUN apt-add-repository ppa:brightbox/ruby-ng
9
-
10
- RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
11
- build-essential \
12
- git \
13
- qemu-utils \
14
- liblz4-tool \
15
- curl \
16
- ruby \
17
- ruby-dev \
18
- python-swiftclient \
19
- ruby-bundler
20
-
21
-
data/centos7/Dockerfile DELETED
@@ -1,25 +0,0 @@
1
- FROM centos:7
2
- MAINTAINER support@brightbox.co.uk
3
-
4
- RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
5
- RUN yum update -y
6
- RUN yum -y install \
7
- centos-release-openstack-train \
8
- epel-release
9
- RUN yum -y install \
10
- gcc \
11
- make \
12
- git \
13
- qemu-img \
14
- lz4 \
15
- ruby-devel \
16
- rubygems \
17
- rubygem-bundler \
18
- ceph-common \
19
- python-swiftclient
20
- RUN mkdir -p /etc/ceph
21
- ARG RBD_USR=libvirt
22
- ARG RBD_PSW
23
- ARG CEPH_MON
24
- RUN echo -e "[client.$RBD_USR]\nkey = $RBD_PSW\n" > /etc/ceph/ceph.client.$RBD_USR.keyring
25
- RUN echo -e "[global]\nmon_host = $CEPH_MON\n" > /etc/ceph/ceph.conf
data/xenial/Dockerfile DELETED
@@ -1,21 +0,0 @@
1
- FROM ubuntu:xenial
2
- MAINTAINER support@brightbox.co.uk
3
-
4
- RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
5
-
6
- RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq software-properties-common
7
-
8
- #RUN apt-add-repository ppa:brightbox/ruby-ng
9
-
10
- RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
11
- build-essential \
12
- git \
13
- qemu-utils \
14
- liblz4-tool \
15
- curl \
16
- ruby \
17
- ruby-dev \
18
- python-swiftclient \
19
- ruby-bundler
20
-
21
-