From fda5a2c48910189da674c5ccb90073fbf82bca18 Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Tue, 8 Jul 2025 11:19:42 +0200 Subject: [PATCH] Remove Puppet Enterprise leftovers (cherry picked from commit fcbd7e9c3e2cb23fb64ac60bfbcc6179b55e1839) This is cherry-picked from https://github.com/OpenVoxProject/ezbake/pull/61 and was originally added in https://github.com/OpenVoxProject/ezbake/pull/16 --- Delete more PE leftovers (cherry picked from commit 48036a8714e98f5558e728aabbbcae371c562f03) this is cherry-picked from https://github.com/OpenVoxProject/ezbake/pull/61 and was originally added in https://github.com/OpenVoxProject/ezbake/pull/18 --- README.md | 9 ---- .../staging-templates/ezbake.rb.mustache | 1 - .../project_data.yaml.mustache | 1 - .../template/global/controller.sh.erb | 4 -- .../lein-ezbake/template/global/ext/fpm.rb | 22 ++------ .../template/global/tasks/build.rake | 43 +++------------- .../template/pe/ext/build_defaults.yaml | 17 ------- .../lein-ezbake/template/pe/ext/default.erb | 50 ------------------- src/puppetlabs/ezbake/core.clj | 3 -- test/unit/puppetlabs/ezbake/core_test.clj | 1 - 10 files changed, 11 insertions(+), 140 deletions(-) delete mode 100644 resources/puppetlabs/lein-ezbake/template/pe/ext/build_defaults.yaml delete mode 100644 resources/puppetlabs/lein-ezbake/template/pe/ext/default.erb diff --git a/README.md b/README.md index 25f625a9..985d5ecc 100644 --- a/README.md +++ b/README.md @@ -248,15 +248,6 @@ infrastructure, see the `local-build` option below. Starting in version 1.6.0 be set in the `JENKINS_USER_AUTH` environment variable to either '' or ':'. -#### `build` for PE - -For PE builds, you need to set an environment variable PE_VER to reflect the -version of PE you're building a package for. e.g.: - -```shell -PE_VER=2016.3 lein with-profile ezbake ezbake build -``` - #### `build` with a different profile ```shell diff --git a/resources/puppetlabs/lein-ezbake/staging-templates/ezbake.rb.mustache b/resources/puppetlabs/lein-ezbake/staging-templates/ezbake.rb.mustache index 48dbb5f3..100d6393 100644 --- a/resources/puppetlabs/lein-ezbake/staging-templates/ezbake.rb.mustache +++ b/resources/puppetlabs/lein-ezbake/staging-templates/ezbake.rb.mustache @@ -21,7 +21,6 @@ module EZBake :cli_defaults_file => {{{cli-defaults-file}}}, :bin_files => {{{bin-files}}}, :create_dirs => {{{create-dirs}}}, - :is_pe_build => {{{is-pe-build}}}, :terminus_info => { {{#terminus-map}} {{{name}}} => { diff --git a/resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache b/resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache index f73a5550..b2cb09c5 100644 --- a/resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache +++ b/resources/puppetlabs/lein-ezbake/staging-templates/project_data.yaml.mustache @@ -60,7 +60,6 @@ templates: - controller.sh.erb tar_excludes: - .gitignore -build_pe: {{{is-pe-build}}} apt_repo_name: {{{repo-name}}} apt_nonfinal_repo_name: {{{nonfinal-repo-name}}} yum_repo_name: {{{repo-name}}} diff --git a/resources/puppetlabs/lein-ezbake/template/global/controller.sh.erb b/resources/puppetlabs/lein-ezbake/template/global/controller.sh.erb index ee876793..fde7f424 100755 --- a/resources/puppetlabs/lein-ezbake/template/global/controller.sh.erb +++ b/resources/puppetlabs/lein-ezbake/template/global/controller.sh.erb @@ -146,10 +146,6 @@ params+=('--replaces' "<%= package -%>,<%= version -%>") params+=('--create-dir' '<%= directory -%>') <% end %> -<% if EZBake::Config[:is_pe_build] -%> -params+=('--enterprise-build') -<% end -%> - if [[ "$os" = 'el' || "$os" = 'sles' || "$os" = 'fedora' || "$os" = 'redhatfips' || "$os" = 'amazon' ]]; then # pull in rpm dependencies <%EZBake::Config[:redhat][:additional_dependencies].each do |dep| -%> diff --git a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb index 47b236a4..b79e3cf1 100755 --- a/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb +++ b/resources/puppetlabs/lein-ezbake/template/global/ext/fpm.rb @@ -16,7 +16,6 @@ options.java = 'java-1.8.0-openjdk-headless' options.release = 1 options.platform_version = 0 -options.is_pe = false options.replaces = {} options.additional_dependencies = [] options.user = 'puppet' @@ -53,9 +52,6 @@ opts.on('--platform-version VERSION', Integer, 'VERSION of the puppet platform this builds for') do |v| options.platform_version = v end - opts.on('--[no-]enterprise-build', 'Whether or not this is a PE build') do |e| - options.is_pe = e - end opts.on('--replaces ', Array, 'PKG and VERSION replaced by this package. Can be passed multiple times.') do |pkg,ver| options.replaces[pkg] = ver end @@ -307,19 +303,13 @@ options.release = "#{options.release}+#{options.dist}" end - if ! options.is_pe - options.java = 'openjdk-21-jre-headless | openjdk-17-jre-headless' - end + options.java = 'openjdk-21-jre-headless | openjdk-17-jre-headless' fpm_opts << '--deb-build-depends cdbs' fpm_opts << '--deb-build-depends bc' fpm_opts << '--deb-build-depends mawk' fpm_opts << '--deb-build-depends lsb-release' - if options.is_pe - fpm_opts << '--deb-build-depends puppet-agent' - else - fpm_opts << '--deb-build-depends "ruby | ruby-interpreter"' - end + fpm_opts << '--deb-build-depends "ruby | ruby-interpreter"' fpm_opts << '--deb-priority optional' fpm_opts << '--category utils' options.deb_interest_triggers.each do |trigger| @@ -382,13 +372,7 @@ termini_opts << "--conflicts 'puppetdb-termini'" end -if options.is_pe - fpm_opts << "--depends pe-java" - fpm_opts << "--depends pe-puppet-enterprise-release" - fpm_opts << "--depends pe-bouncy-castle-jars" -else - fpm_opts << "--depends '#{options.java}'" -end +fpm_opts << "--depends '#{options.java}'" fpm_opts << "--depends bash" fpm_opts << "--depends net-tools" diff --git a/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake b/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake index eee51f8b..8b7c3fd1 100644 --- a/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake +++ b/resources/puppetlabs/lein-ezbake/template/global/tasks/build.rake @@ -36,17 +36,9 @@ namespace :pl do Pkg::Util::Execution.success?(exitstatus) or raise "Error running packaging: #{stdout}\n#{stderr}" puts "#{stdout}\n#{stderr}" - # I'm so sorry - # These paths are hard-coded in packaging, so hard code here too. - # When everything is moved to artifactory this should be able - # to be fixed. --MMR, 2017-08-30 - if Pkg::Config.build_pe - platform_path = "pe/rpm/#{os}-#{ver}-" - else - # carry forward defaults from mock.rake - repo = Pkg::Config.yum_repo_name || 'products' - platform_path = "#{os}/#{ver}/#{repo}/" - end + # carry forward defaults from mock.rake + repo = Pkg::Config.yum_repo_name || 'products' + platform_path = "#{os}/#{ver}/#{repo}/" # We want to include the arches for amazon/el/sles/fedora/redhatfips paths ['x86_64', 'i386'].each do |arch| @@ -64,16 +56,10 @@ namespace :pl do repo = Pkg::Config.apt_repo_name || '' platform = cow.split('-')[1..-2].join('-') - # Keep on keepin' on with hardcoded paths in packaging - # Hopefully this goes away with artifactory. - # --MMR, 2017-08-30 - platform_path = "pe/deb/#{platform}" - unless Pkg::Config.build_pe - # get rid of the trailing slash if repo = '' - platform_path = "deb/#{platform}/#{repo}".sub(/\/$/, '') - end + # get rid of the trailing slash if repo = '' + platform_path = "deb/#{platform}/#{repo}".sub(/\/$/, '') - FileUtils.mkdir_p("#{pkg_path}/#{platform_path}") unless File.directory?("#{pkg_path}/#{platform_path}") + FileUtils.mkdir_p("#{pkg_path}/#{platform_path}") # there's no differences in packaging for deb vs ubuntu so picking debian # if that changes we'll need to fix that puts "====================================" @@ -136,14 +122,6 @@ namespace :pl do ] } - if Pkg::Config.build_pe - Pkg::Util.check_var('PE_VER', ENV['PE_VER']) - parameter_json[:parameter] << { - name: 'PE_VER', - value: ENV['PE_VER'] - } - end - curl_opts << %(--form json='#{parameter_json.to_json}') curl_url = "#{args[:job_url]}/build" @@ -163,13 +141,8 @@ namespace :pl do desc "trigger jenkins packaging job with local auth" task :trigger_build_local_auth => "pl:fetch" do - if Pkg::Config.build_pe - jenkins_hostname = 'jenkins-enterprise.delivery.puppetlabs.net' - stream = 'enterprise' - else - jenkins_hostname = 'jenkins-platform.delivery.puppetlabs.net' - stream = 'platform' - end + jenkins_hostname = 'jenkins-platform.delivery.puppetlabs.net' + stream = 'platform' job_url = "https://#{jenkins_hostname}/job/#{stream}_various-packaging-jobs_packaging-os-clj_lein-ezbake-generic" begin diff --git a/resources/puppetlabs/lein-ezbake/template/pe/ext/build_defaults.yaml b/resources/puppetlabs/lein-ezbake/template/pe/ext/build_defaults.yaml deleted file mode 100644 index 56481ecb..00000000 --- a/resources/puppetlabs/lein-ezbake/template/pe/ext/build_defaults.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -default_cow: 'base-bionic-amd64.cow' -cows: 'base-bionic-amd64.cow base-focal-amd64.cow base-jammy-amd64.cow' -pbuild_conf: '/etc/pbuilderrc' -packager: 'puppet' -gpg_key: '4528B6CD9E61EF26' -sign_tar: FALSE -# a space separated list of mock configs -final_mocks: 'pupent-el7-x86_64 pupent-el8-x86_64 pupent-el9-x86_64 pupent-redhatfips7-x86_64 pupent-redhatfips8-x86_64 pupent-sles12-x86_64 pupent-sles15-x86_64' -yum_host: 'yum.puppetlabs.com' -yum_repo_path: '/opt/repository/yum/' -build_gem: FALSE -build_dmg: FALSE -build_ips: FALSE -apt_host: 'apt.puppetlabs.com' -apt_repo_url: 'http://apt.puppetlabs.com' -apt_repo_path: '/opt/repository/incoming' diff --git a/resources/puppetlabs/lein-ezbake/template/pe/ext/default.erb b/resources/puppetlabs/lein-ezbake/template/pe/ext/default.erb deleted file mode 100644 index 7b3751ea..00000000 --- a/resources/puppetlabs/lein-ezbake/template/pe/ext/default.erb +++ /dev/null @@ -1,50 +0,0 @@ -########################################### -# Init settings for <%= EZBake::Config[:project] %> -########################################### - -# Location of your Java binary (version 8) -JAVA_BIN="/opt/puppetlabs/server/bin/java" - -# Modify this if you'd like to change the memory allocation, enable JMX, etc -JAVA_ARGS="<%= EZBake::Config[:java_args] %>" - -# Modify this as you would JAVA_ARGS but for non-service related subcommands -JAVA_ARGS_CLI="${JAVA_ARGS_CLI:-<%= EZBake::Config[:java_args_cli] %>}" - -# Modify this if you'd like TrapperKeeper specific arguments -TK_ARGS="<%= EZBake::Config[:tk_args] %>" - -# These normally shouldn't need to be edited if using OS packages -USER="<%= EZBake::Config[:user] %>" -GROUP="<%= EZBake::Config[:group] %>" -INSTALL_DIR="/opt/puppetlabs/server/apps/<%= EZBake::Config[:real_name] %>" -CONFIG="/etc/puppetlabs/<%= EZBake::Config[:real_name] %>/conf.d" - -# Bootstrap path -<% if EZBake::Config[:bootstrap_source] == 'services-d' -%> -BOOTSTRAP_CONFIG="/etc/puppetlabs/<%= EZBake::Config[:real_name] %>/services.d/,/opt/puppetlabs/server/apps/<%= EZBake::Config[:real_name] %>/config/services.d/" -<% else -%> -BOOTSTRAP_CONFIG="/etc/puppetlabs/<%= EZBake::Config[:real_name] %>/bootstrap.cfg" -<% end -%> - -# SERVICE_STOP_RETRIES can be set here to alter the default stop timeout in -# seconds. For systemd, the shorter of this setting or 'TimeoutStopSec' in -# the systemd.service definition will effectively be the timeout which is used. -SERVICE_STOP_RETRIES=<%= EZBake::Config[:stop_timeout] %> - -# START_TIMEOUT can be set here to alter the default startup timeout in -# seconds. For systemd, the shorter of this setting or 'TimeoutStartSec' -# in the service's systemd.service configuration file will effectively be the -# timeout which is used. -START_TIMEOUT=<%= EZBake::Config[:start_timeout] %> - -<% if EZBake::Config[:open_file_limit] -%> -# OPEN_FILE_LIMIT can be set here to alter the number of open file descriptors -# allowed by the service. This is used in System-V style init scripts only, and -# will have no effect in systemd. -OPEN_FILE_LIMIT=<%= EZBake::Config[:open_file_limit] %> -<% end -%> - -# Maximum number of seconds that can expire for a service reload attempt before -# the result of the attempt is interpreted as a failure. -RELOAD_TIMEOUT=<%= EZBake::Config[:reload_timeout] %> diff --git a/src/puppetlabs/ezbake/core.clj b/src/puppetlabs/ezbake/core.clj index cd011494..3c7f9efa 100644 --- a/src/puppetlabs/ezbake/core.clj +++ b/src/puppetlabs/ezbake/core.clj @@ -656,8 +656,6 @@ Additional uberjar dependencies: :stop-timeout (-> (get-local :stop-timeout 60) str as-ruby-literal) :open-file-limit (as-ruby-literal (get-local :open-file-limit nil)) - :is-pe-build (-> (= "pe" (get-local :build-type "foss")) - as-ruby-literal) :main-namespace (local->ruby :main-namespace "puppetlabs.trapperkeeper.main") :java-args (local->ruby :java-args @@ -720,7 +718,6 @@ Additional uberjar dependencies: (deputils/generate-manifest-string lein-project)) :uberjar-name (:uberjar-name lein-project) :additional-uberjars (mapv (fn [filename] {:uberjar filename}) additional-uberjars) - :is-pe-build (format "%s" (= (get-local-ezbake-var lein-project :build-type "foss") "pe")) :repo-name (format "%s" (get-local-ezbake-var lein-project :repo-target "")) :nonfinal-repo-name (format "%s" (get-local-ezbake-var lein-project :nonfinal-repo-target ""))}))) diff --git a/test/unit/puppetlabs/ezbake/core_test.clj b/test/unit/puppetlabs/ezbake/core_test.clj index 560f834d..f45b3946 100644 --- a/test/unit/puppetlabs/ezbake/core_test.clj +++ b/test/unit/puppetlabs/ezbake/core_test.clj @@ -37,7 +37,6 @@ :main-namespace "'puppetlabs.trapperkeeper.main'" :debian-interested-upgrade-triggers () :packaging-version "'1'" - :is-pe-build "false" :reload-timeout "'120'" :bootstrap-source "'bootstrap-cfg'" :package-name "'dummy'"