Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(PE-37713) Copy files included with :include-dir to staging directory #634

Merged

Conversation

rileynewton
Copy link
Contributor

Please add all notable changes to the "Unreleased" section of the CHANGELOG.

@rileynewton rileynewton force-pushed the PE-37713-add-copying-resources-from-dir branch from 6aa6ca5 to 4ea92de Compare June 10, 2024 22:17
@rileynewton rileynewton force-pushed the PE-37713-add-copying-resources-from-dir branch from add0017 to 8724666 Compare June 10, 2024 22:24
@rileynewton
Copy link
Contributor Author

What is copied now looks good:

Copying additional uberjars to staging directory
Copying lein-ezbake resources from included directory: resources/ext/bin/generate-puppet-types.rb to target/staging/ext/bin/generate-puppet-types.rb.
Copying lein-ezbake resources from included directory: resources/ext/build-scripts/jruby-stdlib-gem-list.txt to target/staging/ext/build-scripts/jruby-stdlib-gem-list.txt.
Copying lein-ezbake resources from included directory: resources/ext/build-scripts/install-vendored-gems.sh to target/staging/ext/build-scripts/install-vendored-gems.sh.
Copying lein-ezbake resources from included directory: resources/ext/build-scripts/jruby-gem-list.txt to target/staging/ext/build-scripts/jruby-gem-list.txt.
Copying lein-ezbake resources from included directory: resources/ext/build-scripts/mri-gem-list-no-deps.txt to target/staging/ext/build-scripts/mri-gem-list-no-deps.txt.
Copying lein-ezbake resources from included directory: resources/ext/config/conf.d/ca.conf to target/staging/ext/config/conf.d/ca.conf.
Copying lein-ezbake resources from included directory: resources/ext/config/conf.d/file-sync.conf to target/staging/ext/config/conf.d/file-sync.conf.
Copying lein-ezbake resources from included directory: resources/ext/config/conf.d/pe-puppet-server.conf to target/staging/ext/config/conf.d/pe-puppet-server.conf.
Copying lein-ezbake resources from included directory: resources/ext/cli/ca.erb to target/staging/ext/cli/ca.erb.
Copying lein-ezbake resources from included directory: resources/ext/cli/gem.erb to target/staging/ext/cli/gem.erb.
Copying lein-ezbake resources from included directory: resources/ext/cli/ruby.erb to target/staging/ext/cli/ruby.erb.
Copying lein-ezbake resources from included directory: resources/ext/cli/irb.erb to target/staging/ext/cli/irb.erb.
Copying lein-ezbake resources from included directory: resources/ext/cli_defaults/cli-defaults.sh.erb to target/staging/ext/cli_defaults/cli-defaults.sh.erb.

In pe-pse all of the resources are copied:

eric.newton@s0h155 ~/PuppetLabs/pe-puppet-server-extensions/resources/ext % ls -l *
-rw-r--r--  1 eric.newton  staff  956 Mar 22  2023 ezbake.conf

bin:
total 24
-rwxr-xr-x  1 eric.newton  staff  8941 Jun 10 14:21 generate-puppet-types.rb

build-scripts:
total 32
-rw-r--r--  1 eric.newton  staff  3175 Jun 10 14:21 install-vendored-gems.sh
-rw-r--r--  1 eric.newton  staff   162 Jun 10 14:21 jruby-gem-list.txt
-rw-r--r--  1 eric.newton  staff   168 Jun 10 14:21 jruby-stdlib-gem-list.txt
-rw-r--r--  1 eric.newton  staff    22 Jun 10 14:21 mri-gem-list-no-deps.txt

cli:
total 32
-rw-r--r--  1 eric.newton  staff  103 Jun 10 14:21 ca.erb
-rw-r--r--  1 eric.newton  staff  568 Jun 10 14:21 gem.erb
-rw-r--r--  1 eric.newton  staff  556 Jun 10 14:21 irb.erb
-rw-r--r--  1 eric.newton  staff  557 Jun 10 14:21 ruby.erb

cli_defaults:
total 8
-rw-r--r--  1 eric.newton  staff  1166 Jun 10 14:21 cli-defaults.sh.erb

config:
total 0
drwxr-xr-x  5 eric.newton  staff  160 Jun 10 14:21 conf.d
eric.newton@s0h155 ~/PuppetLabs/pe-puppet-server-extensions/resources/ext % cd config/conf.d 
eric.newton@s0h155 ~/PuppetLabs/pe-puppet-server-extensions/resources/ext/config/conf.d % ls -l
total 24
-rw-r--r--  1 eric.newton  staff    49 Jun 10 14:21 ca.conf
-rw-r--r--  1 eric.newton  staff   578 Jun 10 14:21 file-sync.conf
-rw-r--r--  1 eric.newton  staff  1958 Jun 10 14:21 pe-puppet-server.conf

and make it to staging

eric.newton@s0h155 ~/PuppetLabs/pe-puppet-server-extensions/target/staging/ext % ls -l *
-rw-r--r--  1 eric.newton  staff    646 Jun 10 15:23 build_defaults.yaml
-rw-r--r--  1 eric.newton  staff  25237 Jun 10 15:24 build_metadata.json
-rw-r--r--  1 eric.newton  staff   2323 Jun 10 15:23 default.erb
-rw-r--r--  1 eric.newton  staff   4172 Jun 10 15:23 ezbake-functions.sh.erb
-rw-r--r--  1 eric.newton  staff    224 Jun 10 15:23 ezbake.logrotate-legacy.conf.erb
-rw-r--r--  1 eric.newton  staff    291 Jun 10 15:23 ezbake.logrotate.conf.erb
-rw-r--r--  1 eric.newton  staff  16149 Jun 10 15:24 ezbake.manifest
-rw-r--r--  1 eric.newton  staff     69 Jun 10 15:23 ezbake.needrestart.conf.erb
-rw-r--r--  1 eric.newton  staff    118 Jun 10 15:23 ezbake.tmpfiles.conf.erb
-rw-r--r--  1 eric.newton  staff  20043 Jun 10 15:23 fpm.rb
-rw-r--r--  1 eric.newton  staff   2949 Jun 10 15:24 project_data.yaml

bin:
total 32
-rw-r--r--  1 eric.newton  staff  8941 Jun 10 15:24 generate-puppet-types.rb
-rw-r--r--  1 eric.newton  staff  2331 Jun 10 15:24 puppetserver.erb

build-scripts:
total 32
-rw-r--r--  1 eric.newton  staff  3175 Jun 10 15:24 install-vendored-gems.sh
-rw-r--r--  1 eric.newton  staff   162 Jun 10 15:24 jruby-gem-list.txt
-rw-r--r--  1 eric.newton  staff   168 Jun 10 15:24 jruby-stdlib-gem-list.txt
-rw-r--r--  1 eric.newton  staff    22 Jun 10 15:24 mri-gem-list-no-deps.txt

cli:
total 64
-rw-r--r--  1 eric.newton  staff   103 Jun 10 15:24 ca.erb
-rw-r--r--  1 eric.newton  staff  1371 Jun 10 15:23 foreground.erb
-rw-r--r--  1 eric.newton  staff   568 Jun 10 15:24 gem.erb
-rw-r--r--  1 eric.newton  staff   556 Jun 10 15:24 irb.erb
-rw-r--r--  1 eric.newton  staff  1373 Jun 10 15:23 reload.erb
-rw-r--r--  1 eric.newton  staff   557 Jun 10 15:24 ruby.erb
-rw-r--r--  1 eric.newton  staff  3053 Jun 10 15:23 start.erb
-rw-r--r--  1 eric.newton  staff   651 Jun 10 15:23 stop.erb

cli_defaults:
total 8
-rw-r--r--  1 eric.newton  staff  1166 Jun 10 15:24 cli-defaults.sh.erb

config:
total 48
-rw-r--r--   1 eric.newton  staff  3441 Jun 10 15:24 bootstrap.cfg
-rw-r--r--   1 eric.newton  staff   847 Jun 10 15:24 code-manager-request-logging.xml
drwxr-xr-x  10 eric.newton  staff   320 Jun 10 15:24 conf.d
-rw-r--r--   1 eric.newton  staff  4440 Jun 10 15:24 logback.xml
-rw-r--r--   1 eric.newton  staff   837 Jun 10 15:24 request-logging-private.xml
-rw-r--r--   1 eric.newton  staff  2420 Jun 10 15:24 request-logging.xml

debian:
total 56
-rw-r--r--  1 eric.newton  staff  5032 Jun 10 15:23 ezbake.init.erb
-rw-r--r--  1 eric.newton  staff  2775 Jun 10 15:23 ezbake.service.erb
-rw-r--r--  1 eric.newton  staff  1187 Jun 10 15:23 postinst.erb
-rw-r--r--  1 eric.newton  staff   327 Jun 10 15:23 postrm.erb
-rw-r--r--  1 eric.newton  staff  1191 Jun 10 15:23 preinst.erb
-rw-r--r--  1 eric.newton  staff   403 Jun 10 15:23 prerm.erb

redhat:
total 72
-rw-r--r--  1 eric.newton  staff  2777 Jun 10 15:23 ezbake.service.erb
-rw-r--r--  1 eric.newton  staff  4103 Jun 10 15:23 init.erb
-rw-r--r--  1 eric.newton  staff  4695 Jun 10 15:23 init.suse.erb
-rw-r--r--  1 eric.newton  staff   686 Jun 10 15:23 postinst.erb
-rw-r--r--  1 eric.newton  staff   458 Jun 10 15:23 postrm.erb
-rw-r--r--  1 eric.newton  staff  1341 Jun 10 15:23 preinst.erb
-rw-r--r--  1 eric.newton  staff   413 Jun 10 15:23 prerm.erb

@rileynewton rileynewton force-pushed the PE-37713-add-copying-resources-from-dir branch from 8724666 to 35de5ab Compare June 11, 2024 21:40
@steveax steveax merged commit 51a050a into puppetlabs:main Jun 11, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants