uricp 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdf0146a9045790fac899c6fd9dd0a2de8d77d8ed5f6e8d652c994ae12bcd5f7
-  data.tar.gz: 6c5b2e4b0f7b210f74f56b0fca2a6ab1ada244110d82f2dba06fab7bd2aefef8
+  metadata.gz: a0432fbf510461f29163cffb6246b417c2aafefdb0b17d01a9cdb3276a285823
+  data.tar.gz: 2f2d65d8de777e59eb1d0ea8ae5a37e2d41061dc8d8ca8ba62ad6d5d36ad8ff0
 SHA512:
-  metadata.gz: e7d1e3ed8d8eda28f56714cf79785a28d2b0733c1f16fe6e2c3d30e4a30fcd6f8f046e275776f7243f43179b281c6966211c1f32192c446a85df6e9453e1e2ee
-  data.tar.gz: d389fd727dde31846e9cdd0f18b0eddb2cba12ef476fdd61819a271caf1bf77afb83f96ba83c9f21c3433f9fb1adaf412a77914028aee416c94d3ac37e527072
+  metadata.gz: e414dd96633873aa1264f4e619daab69f477429a0ba1d8e3c29c01964cfcfc0f3b53832181716c7f687066d473854aed5055329dd69bdad510dcbb7af7840c0e
+  data.tar.gz: 7d21dcfe38d979ef17f85c1afa1b35017a8def5e65d6363878da440330c761b4cf3dc694600467d64b7ab014a6f79e194bcac3090c43db6908d98fb1ba33098a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.36)
+    uricp (0.0.37)
       childprocess (~> 1.0)
       filesize (= 0.0.2)
       methadone (~> 2.0.2)

data/Jenkinsfile

@@ -40,30 +40,6 @@ pipeline {
         }
       }
     }
-    stage("CentOS 7") {
-      agent {
-        dockerfile {
-          dir 'centos7'
-          label "docker"
-          additionalBuildArgs '--build-arg CEPH_MON --build-arg RBD_USR --build-arg RBD_PSW'
-        }
-      }
-      steps {
-        sh 'rbd --id "${RBD_USR}" ls servers'
-        sh 'bundle install --deployment'
-        sh 'bundle exec rake features:new_qemu'
-      }
-      post {
-        always {
-          sh 'bundle exec rake features:clean'
-        }
-        failure {
-            mail to: 'sysadmin@brightbox.co.uk',
-             subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
-             body: "${env.BUILD_URL}"
-        }
-      }
-    }
     stage("Focal, Ruby 2.7.0") {
       agent {
         dockerfile {
@@ -88,50 +64,6 @@ pipeline {
         }
       }
     }
-    stage("Xenial, Ruby 2.3.1") {
-      agent {
-        dockerfile {
-          dir 'xenial'
-          label "docker"
-        }
-      }
-      steps {
-        sh 'bundle install --deployment'
-        sh 'bundle exec rake features:new_qemu'
-      }
-      post {
-        always {
-          sh 'bundle exec rake features:clean'
-        }
-        failure {
-            mail to: 'sysadmin@brightbox.co.uk',
-             subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
-             body: "${env.BUILD_URL}"
-        }
-      }
-    }
-    stage("Bionic, Ruby 2.5.1") {
-      agent {
-        dockerfile {
-          dir 'bionic'
-          label "docker"
-        }
-      }
-      steps {
-        sh 'bundle install --deployment'
-        sh 'bundle exec rake features:new_qemu'
-      }
-      post {
-        always {
-          sh 'bundle exec rake features:clean'
-        }
-        failure {
-            mail to: 'sysadmin@brightbox.co.uk',
-             subject: "Uricp Tests Failed: ${currentBuild.fullDisplayName}",
-             body: "${env.BUILD_URL}"
-        }
-      }
-    }
   }
   post {
     failure {

data/almalinux8/Dockerfile

@@ -1,12 +1,13 @@
-FROM almalinux:8
+FROM almalinux:8.9
 MAINTAINER support@brightbox.co.uk
 
 RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
 RUN dnf -y install dnf-plugins-core
-RUN dnf config-manager --add-repo https://repo.almalinux.org/almalinux/8/devel/almalinux-devel.repo
-RUN echo "8-stream" > /etc/dnf/vars/stream
-RUN dnf -y update
-RUN dnf config-manager --set-enabled powertools,devel
+#RUN dnf config-manager --add-repo https://repo.almalinux.org/almalinux/8/devel/almalinux-devel.repo
+#RUN echo "8-stream" > /etc/dnf/vars/stream
+#RUN dnf -y update
+#RUN dnf config-manager --set-enabled powertools,devel
+RUN dnf config-manager --set-enabled powertools
 RUN dnf -y group install "Development Tools"
 RUN dnf -y install https://www.rdoproject.org/repos/rdo-release.el8.rpm
 RUN dnf -y install \

data/features/rbd_access.feature

@@ -80,6 +80,26 @@ Feature: Manipulate file images in ceph
     rbd clone --id libvirt 'servers/freedos.qcow2@base' 'servers/srv-testy'
     """
 
+  Scenario: file URI to rbd via cache
+    Given a correctly initialised cache at "/tmp/uricp"
+    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'`
+    And the output should contain:
+    """
+    rbd import --no-progress --id libvirt - <'/dev/servers/srv-testy-vol_frozen' 'servers/srv-testy-vol'
+    """
+    And the output should not contain:
+    """
+    snap create
+    """
+    And the output should not contain:
+    """
+    snap protect
+    """
+    And the output should not contain:
+    """
+    rbd clone
+    """
+
   Scenario: rbd to rbd - no cache
     Given a correctly initialised cache at "/tmp/uricp"
     When I successfully run `uricp --dry-run rbd:///servers/img-testy rbd:///servers/srv-testy`

data/lib/uricp/strategy/cached_get.rb

@@ -23,9 +23,9 @@ module Uricp::Strategy
 
     def proposal
       @proposed_options = options.dup
-      @proposed_options['from_uri'] = URI.join('file:///', cache_file) unless file_source?
-      if to.scheme == 'rbd'
-        @proposed_options['rbd_cache_name'] = rbd_cache_image_spec(to)
+      unless file_source?
+        @proposed_options['from_uri'] = URI.join('file:///', cache_file)
+        @proposed_options['rbd_cache_name'] = rbd_cache_image_spec(to) if to.scheme == 'rbd'
       end
       @proposed_options.delete('cache')
       @proposed_options.delete('cache_name')

data/lib/uricp/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Uricp
-  VERSION = '0.0.36'
+  VERSION = '0.0.37'
   DEFAULT_SEGMENT_SIZE = '5 GiB'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -170,8 +170,6 @@ files:
 - almalinux8/Dockerfile
 - bin/segment_upload
 - bin/uricp
-- bionic/Dockerfile
-- centos7/Dockerfile
 - cucumber.yml
 - features/auth_download.feature
 - features/cacheable_from_uri.feature
@@ -225,7 +223,6 @@ files:
 - lib/uricp/uri_strategy.rb
 - lib/uricp/version.rb
 - uricp.gemspec
-- xenial/Dockerfile
 homepage: ''
 licenses:
 - gplv3
@@ -245,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.5
 signing_key: 
 specification_version: 4
 summary: Copy one URL to another with optional cacheing

data/bionic/Dockerfile

@@ -1,21 +0,0 @@
-FROM ubuntu:bionic
-MAINTAINER support@brightbox.co.uk
-
-RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq software-properties-common
-
-#RUN apt-add-repository ppa:brightbox/ruby-ng
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
-  build-essential \
-  git \
-  qemu-utils \
-  liblz4-tool \
-  curl \
-  ruby \
-  ruby-dev \
-  python-swiftclient \
-  ruby-bundler
-
-

data/centos7/Dockerfile

@@ -1,25 +0,0 @@
-FROM centos:7
-MAINTAINER support@brightbox.co.uk
-
-RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
-RUN yum update -y
-RUN yum -y install \
-    centos-release-openstack-train \
-    epel-release 
-RUN yum -y install \
-    gcc \
-    make \
-    git \
-    qemu-img \
-    lz4 \
-    ruby-devel \
-    rubygems \
-    rubygem-bundler \
-    ceph-common \
-    python-swiftclient
-RUN mkdir -p /etc/ceph
-ARG RBD_USR=libvirt
-ARG RBD_PSW
-ARG CEPH_MON
-RUN echo -e "[client.$RBD_USR]\nkey = $RBD_PSW\n" > /etc/ceph/ceph.client.$RBD_USR.keyring
-RUN echo -e "[global]\nmon_host = $CEPH_MON\n" > /etc/ceph/ceph.conf

data/xenial/Dockerfile

@@ -1,21 +0,0 @@
-FROM ubuntu:xenial
-MAINTAINER support@brightbox.co.uk
-
-RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq software-properties-common
-
-#RUN apt-add-repository ppa:brightbox/ruby-ng
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y -qq \
-  build-essential \
-  git \
-  qemu-utils \
-  liblz4-tool \
-  curl \
-  ruby \
-  ruby-dev \
-  python-swiftclient \
-  ruby-bundler
-
-