Merge pull request #64 from bastelfreak/pe

Remove Puppet Enterprise leftovers

Author: bastelfreak

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 '<job token>'
 or '<ldap username>:<personal auth token>'.
 
-#### `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

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}}} => {

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}}}

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| -%>

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 <PKG,VERSION>', 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"

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

resources/puppetlabs/lein-ezbake/template/pe/ext/build_defaults.yaml

@@ -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 ""))})))
 

resources/puppetlabs/lein-ezbake/template/pe/ext/default.erb

@@ -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'"