Hub update by merging enterprise.

.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
+group: edge
 
 import:
   - travis-ci/build-configs:[email protected]
@@ -23,6 +24,8 @@ services:
   - rabbitmq
 
 before_install:
+  - gem uninstall -v '>=2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '2.3.7'
   - bundle config https://gems.contribsys.com/ $BUNDLE_GEMS__CONTRIBSYS__COM
   - gem install bundler -v 2.4.14
 
@@ -34,10 +37,6 @@ jobs:
       dist: bionic
       ruby:
       services:
-      addons:
-        snaps:
-          - name: docker
-            channel: latest/beta
       before_install: echo "skipping"
       install: echo "skipping"
       before_sript: skip

Dockerfile.tcie

@@ -0,0 +1,38 @@
+FROM ruby:3.2.2-slim
+
+LABEL maintainer Travis CI GmbH <[email protected]>
+
+RUN ( \
+   bundle config set no-cache 'true'; \
+   bundle config --global frozen 1; \
+   bundle config set deployment 'true'; \
+   mkdir -p /app; \
+)
+
+WORKDIR /app
+
+COPY Gemfile      /app
+COPY Gemfile.lock /app
+ARG bundle_gems__contribsys__com
+
+RUN ( \
+   apt-get update ; \
+   apt-get upgrade -y ; \
+   apt-get install -y git make gcc g++ libpq-dev curl \
+   && rm -rf /var/lib/apt/lists/*; \
+   curl -sLO http://ppa.launchpad.net/rmescandon/yq/ubuntu/pool/main/y/yq/yq_3.1-2_amd64.deb && \
+   dpkg -i yq_3.1-2_amd64.deb && \
+   rm -f yq_3.1-2_amd64.deb; \
+   gem install bundler -v '2.3.14'; \
+   bundle config https://gems.contribsys.com/ $bundle_gems__contribsys__com \
+      && bundle config set without 'development test' \
+      && bundle install --deployment \
+      && bundle config --delete https://gems.contribsys.com/; \
+   apt-get remove -y gcc g++ make git perl && apt-get -y autoremove; \
+   bundle clean && rm -rf /app/vendor/bundle/ruby/2.5.0/cache/*; \
+   rm -rf /usr/local/bundle/cache/\*.gem; \
+   find /usr/local/bundle/gems/ \( -name '*.c' -o -name '*.h' -o -name '*.cpp' -o -name '*.o' \) -delete; \
+   find /app/vendor/ \( -name '*.c' -o -name '*.h' -o -name '*.cpp' -o -name '*.o' \) -delete; \
+)
+
+COPY . /app

Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 ruby '3.2.2'
 
-gem 'sidekiq-pro', source: 'https://gems.contribsys.com'
+gem 'sidekiq-pro', '~> 5.1.1', source: 'https://gems.contribsys.com'
+gem 'sidekiq', '~> 6.4'
 
 gem 'travis-exceptions',      git: 'https://github.com/travis-ci/travis-exceptions'
 gem 'travis-logger',          git: 'https://github.com/travis-ci/travis-logger'
@@ -16,7 +17,7 @@ gem 'travis-support', git: 'https://github.com/travis-ci/travis-support'
 gem 'metriks',                 git: 'https://github.com/travis-ci/metriks'
 gem 'metriks-librato_metrics', git: 'https://github.com/travis-ci/metriks-librato_metrics'
 
-gem 'marginalia', git: 'https://github.com/travis-ci/marginalia'
+gem 'marginalia', git: 'https://github.com/travis-ci/marginalia', branch: '5.x'
 
 gem 'activerecord', '~> 7'
 gem 'bunny'
@@ -26,9 +27,10 @@ gem 'pg', '~> 1'
 gem 'rake'
 gem 'redis'
 gem 'rollout', git: 'https://github.com/travis-ci/rollout'
+gem 'addressable', '~> 2.8.0'
 
 gem 'coder'
-gem 'gh', git: 'https://github.com/travis-ci/gh'
+gem 'gh', git: 'https://github.com/travis-ci/gh', branch: 'tcie3-0_15_2'
 gem 'keen'
 gem 'multi_json'
 gem 'redlock'
@@ -47,7 +49,7 @@ group :test do
   gem 'mocha', '~> 2'
   gem 'pry'
   gem 'rack-test'
-  gem 'rspec', '~> 3.12'
+  gem 'rspec', '~> 3.12', '~> 2.3.2'
   gem 'sinatra-contrib'
   gem 'webmock'
 end

Makefile

@@ -31,7 +31,7 @@ DOCKER ?= docker
 
 .PHONY: docker-build
 docker-build:
-	$(DOCKER) build --build-arg bundle_gems__contribsys__com=$(BUNDLE_GEMS__CONTRIBSYS__COM) -t $(DOCKER_DEST) .
+	$(DOCKER) build --pull --no-cache --build-arg bundle_gems__contribsys__com=$(BUNDLE_GEMS__CONTRIBSYS__COM) -t $(DOCKER_DEST) . -f Dockerfile.tcie
 
 .PHONY: docker-login
 docker-login:

bin/sidekiq

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-index=$(echo ${DYNO:-1} | sed 's/.*\.//')
 threads=$1
 shift
 queues=$@

lib/travis/addons/handlers/billing.rb

@@ -17,7 +17,7 @@ def handle?
         end
 
         def handle
-          publish
+          publish unless Travis::Hub.context.config.enterprise?
         end
 
         private

lib/travis/addons/handlers/email.rb

@@ -44,9 +44,11 @@ def configured_emails
           end
 
           def default_emails
-            emails = [commit.author_email, commit.committer_email]
+            emails = [commit.author_email&.downcase, commit.committer_email&.downcase]
             user_ids = object.repository.permissions.pluck(:user_id)
-            ::Email.where(email: emails, user_id: user_ids).pluck(:email).uniq
+            ::Email.where(user_id: user_ids).pluck(:email).uniq.each do |email|
+                email if emails.include? email.downcase
+              end
           end
 
           def unsubscribed_emails

lib/travis/addons/handlers/webhook.rb

@@ -18,7 +18,11 @@ def handle
           end
 
           def targets
-            @targets ||= config.values(:urls)
+            @targets ||= (config.values(:urls) || []) .push(*global_urls)
+          end
+
+          def global_urls
+            @global_urls ||= ENV['TRAVIS_HUB_WEBHOOK_GLOBAL_URLS']&.split(';') || []
           end
 
           class Instrument < Addons::Instrument

lib/travis/hub/api/jwt.rb

@@ -14,7 +14,6 @@ def run
     def valid?
       return false unless refresh_token.valid?
       return false unless redis.exists?(refresh_key)
-
       redis.del(refresh_key)
       true
     end

lib/travis/hub/config.rb

@@ -42,7 +42,8 @@ def jwt_key(type)
              limit: { resets: { max: 50, after: 6 * 60 * 60 } },
              notifications: ['billing'],
              auth: { jwt_private_key: jwt_key(:private), jwt_public_key: jwt_key(:public), http_basic_auth: },
-             billing: { url: ENV['BILLING_URL'] || 'http://localhost:9292', auth_key: ENV['BILLING_AUTH_KEY'] || 't0Ps3Cr3t' }
+             billing: { url: ENV['BILLING_URL'] || 'http://localhost:9292', auth_key: ENV['BILLING_AUTH_KEY'] || 't0Ps3Cr3t' },
+             billing:        { url: ENV['BILLING_URL'] || 'http://localhost:9292', auth_key: ENV['BILLING_AUTH_KEY'] || 't0Ps3Cr3t' }
 
       def metrics
         # TODO: cleanup keychain?

lib/travis/hub/support/sidekiq.rb

@@ -9,6 +9,7 @@ module Travis
   module Sidekiq
     def setup(config)
       ::Sidekiq.configure_server do |c|
+        c.logger.level = Logger::WARN
         c.redis = {
           url: config.redis.url,
           id: nil

lib/travis/sidekiq.rb

@@ -62,6 +62,14 @@ def billing(*args)
       )
     end
 
+    def billing(*args)
+      default_client.push(
+        'queue' => 'billing',
+        'class' => 'Travis::Billing::Worker',
+        'args'  => [nil, "Travis::Billing::Services::UsageTracker", 'perform', *args]
+      )
+    end
+
     private
 
     def default_client

spec/support/factories.rb

@@ -66,6 +66,11 @@ def config=(config)
     config          { { arch: 'amd64', os: 'linux', virt: 'vm' } }
   end
 
+  factory :job_config do
+    key             'key'
+    config          { { arch: 'amd64', os: 'linux', virt: 'vm' } }
+  end
+
   factory :user do
   end
 

spec/travis/addons/handlers/email_spec.rb

@@ -198,9 +198,8 @@
 
       before do
         Email.create(user:, email: address)
-        user.update!(preferences: JSON.dump(build_emails: false))
+        user.update!(preferences: {:build_emails => false})
       end
-
       it { expect(handler.recipients).to be_empty }
     end
   end