conjur-debify 3.0.3.pre.1971 → 3.0.3.pre.1981

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbb48a20c69ae4de07aa6be5a0812fc434862d0a6b892ac9e14307a699d4eca4
-  data.tar.gz: e49635adbf456eee2eac799f8eea2be543c27b52bcec615de92e755c47cca5e1
+  metadata.gz: f59f248642626ad2fd484fe7ce73a98a26def7f2218f73e740e798f225d27f94
+  data.tar.gz: dc88be5619ec05aea79b51e3e1e6e2855f39cf7f9111dc350567c12a9e33791e
 SHA512:
-  metadata.gz: 51126d13fd0a308ad4d3b753cd9edbdc425069ae20a3a583d4db1d2b5e5b4dd2ed99adf1e5235235eff5c03c6fd2a9c4a2daff3e0a26b33665648da0ac9e3c3f
-  data.tar.gz: 4d78bc9be16f8b8b4f3e7d70b51fea06beef7611de142f2bba84d912f72237a872b730de52049a1c16695c7d88f533cae81d9b5e0bfcb5f3fcebbf45abdd063a
+  metadata.gz: 4d1ce19bd3da4beab66c679b11bb1aa6e4d656c4b19735719a9ec9ca703ad4915b97d56aaf5a5f6791f8cfaa807800cc5a6b430fd56d93a097193f5280049b05
+  data.tar.gz: c98a222617ee803351fd4180edd3981b089dba989aa4291890985961d2991896f814e5fbbe01f19eae0b0d58cdc752df7c4a9004d5a059c57720c5092953929c

data/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## [3.0.3]
 ### Added
 - Allow user to specify architecture of packages (arm64 or amd64)
+- Upload artifacts for all packaged architectures to artifactory
 
 ## [3.0.2]
 ### Changed

data/README.md

@@ -117,7 +117,7 @@ COMMAND OPTIONS
     --additional-files=arg - Specify files to add to the FPM image that are not included from the git repo (default: none)
     -d, --dir=arg          - Set the current working directory (default: none)
     --dockerfile=arg       - Specify a custom Dockerfile.fpm (default: none)
-    -i, --image=arg        - Image name (default: cyberark/phusion-ruby-fips)
+    -i, --image=arg        - Image name (default: cyberark/ubuntu-ruby-builder)
     -o, --output=arg       - Set the output file type of the fpm command (e.g rpm) (default: none)
     -t, --image-tag=arg    - Image tag, e.g. 4.5-stable, 4.6-stable (default: latest)
     -v, --version=arg      - Specify the deb version; by default, it's read from the VERSION file (default: none)

data/VERSION

@@ -1 +1 @@
-3.0.3-1971
+3.0.3-1981

data/features/package.feature

@@ -38,7 +38,14 @@ Feature: Packaging
     Then the stdout from "find ../../example" should not contain "conjur-example_0.0.1-suffix_arm64.deb"
     And the stdout from "find ../../example" should not contain "conjur-example-0.0.1_suffix-1.aarch64.rpm"
 
-  Scenario: 'example' project can be published
+  Scenario: 'example' project can be published with amd64 architecture
     Given I successfully run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example -v 0.0.1-suffix example -- --post-install /distrib/postinstall.sh`
     And I successfully run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example --output rpm  -v 0.0.1-suffix example  -- --post-install /distrib/postinstall.sh`
     When I successfully run `env DEBUG=true GLI_DEBUG=true debify publish -v 0.0.1-suffix -d ../../example 5.0 example`
+
+#  Scenario: 'example' project can be published with amd64 and arm64 architectures
+    Given I successfully run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example -v 0.0.1-suffix example -- --post-install /distrib/postinstall.sh`
+    And I successfully run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example --architecture="aarch64" -v 0.0.1-suffix example -- --post-install /distrib/postinstall.sh`
+    And I successfully run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example --output rpm  -v 0.0.1-suffix example  -- --post-install /distrib/postinstall.sh`
+    And I successfully run `env DEBUG=true GLI_DEBUG=true debify package -d ../../example --output rpm --architecture="aarch64"  -v 0.0.1-suffix example  -- --post-install /distrib/postinstall.sh`
+    When I successfully run `env DEBUG=true GLI_DEBUG=true debify publish -v 0.0.1-suffix -d ../../example 5.0 example`

data/lib/conjur/debify/action/publish.rb

@@ -38,7 +38,7 @@ module Conjur::Debify
             art_user, art_password = fetch_art_creds
           end
 
-          # Publish deb package
+          # Publish AMD64 deb package
           component = cmd_options[:component] || detect_component
           deb_info = "#{distribution}/#{component}/amd64"
           package_name = "conjur-#{project_name}_#{version}_amd64.deb"
@@ -53,10 +53,26 @@ module Conjur::Debify
             deb_info: deb_info
           )
 
+          # (Optional) Publish ARM64 deb package
+          unless Dir.glob('*_arm64.deb').empty?
+            deb_info = "#{distribution}/#{component}/arm64"
+            package_name = "conjur-#{project_name}_#{version}_arm64.deb"
+            publish_package(
+              publish_image: publish_image,
+              art_url: art_url,
+              art_user: art_user,
+              art_password: art_password,
+              art_repo: deb_art_repo,
+              package_name: package_name,
+              dir: dir,
+              deb_info: deb_info
+            )
+          end
+
           # Publish RPM package
           # The rpm builder replaces dashes with underscores in the version
           rpm_version = version.tr('-', '_')
-          package_name = "conjur-#{project_name}-#{rpm_version}-1.x86_64.rpm"
+          package_name = "conjur-#{project_name}-#{rpm_version}-1.*.rpm"
           rpm_art_repo = cmd_options['rpm-repo']
           publish_package(
             publish_image: publish_image,

data/lib/conjur/debify.rb

@@ -257,7 +257,7 @@ command "package" do |c|
   c.flag [:'additional-files']
 
   c.desc "Image name"
-  c.default_value "cyberark/phusion-ruby-fips"
+  c.default_value "cyberark/ubuntu-ruby-builder"
   c.flag [:i, :image]
 
   c.desc "Image tag, e.g. 4.5-stable, 4.6-stable"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 3.0.3.pre.1971
+  version: 3.0.3.pre.1981
 platform: ruby
 authors:
 - CyberArk Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2023-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli