Enterprise to master. #1316

SebastianKarpetaDev · 2024-03-19T14:15:29Z

No description provided.

Co-authored-by: gabriel-arc <[email protected]>

* repo settings merge from master

* Rspec are loading & some deprecation fixes * some Arel and handling string as hash * No more composite keys * fixing deprecations for rake - parsing json * fixing deprecations * further cleanup * Some fixex including repo - but logic must be discussed * cleanup with composite keys * Revert "cleanup with composite keys" This reverts commit c9c7960. * Revert "No more composite keys" This reverts commit 8fb395e. * further changes and fixes * More spohisticated changes * ruby, ar upgrade && annoying bug fix for composite keys * Cleanup after not proper fixes * sentry & openssl upgrade * add root to serialized json * Proper gems are used * USing old Metrics * Next fixes * almost there * All green * Further gems update * problems with simple states * removing s3 step 1 * moving s3 to fog * s3 totally removed * some Gemfile changes * docker fix * sidekiq update * better regexp * Nicely usage of Mustermann * guard for AR patch * clear active connections * nokogiri bump * Parse config if string * Ensure Hash is saved into Json settings/preferences * next approach to make settings an actual hash * Ensure settings/preferences are hash Co-authored-by: Maciej <[email protected]> Co-authored-by: gabriel-arc <[email protected]>

* github_apps update * activerecord bump to 6.1.6.1 * permit symbol in yaml deserializer for debug

* BSFY-141 merge - add restarted by

* bundler update * merge from master 31.10.22 * usr/group update * ship:docker

* Add tag_name to build request * Restrict ruby gem-update version --------- Co-authored-by: piccadilly-circus <[email protected]>

gbarc-dt · 2024-03-19T14:16:59Z

Gemfile

-gem 'travis-lock',     git: 'https://github.com/travis-ci/travis-lock'
-gem 'travis-github_apps', git: 'https://github.com/travis-ci/travis-github_apps'
+gem 'travis-settings', git: 'https://github.com/travis-ci/travis-settings', branch: 'master'
+gem 'travis-lock',     git: 'https://github.com/travis-ci/travis-lock/', branch: '6.1'


master, latest updates are already merged

gbarc-dt · 2024-03-19T14:17:26Z

Gemfile

 gem 'travis-rollout',  git: 'https://github.com/travis-ci/travis-rollout'
 gem 'simple_states',  git: 'https://github.com/travis-ci/simple_states', branch: 'prd-ruby-upgrade-dev'
-gem 'metriks',        git: 'https://github.com/travis-ci/metriks'


don't remove

gbarc-dt · 2024-03-19T14:17:31Z

Gemfile

 gem 'marginalia', git: 'https://github.com/travis-ci/marginalia'
 gem 'gh',   git: 'https://github.com/travis-ci/gh'
 gem 'rollout',           git: 'https://github.com/travis-ci/rollout'

-gem 'mustermann'


don't remove

gbarc-dt · 2024-03-19T14:18:12Z

Gemfile

 gem 'rack-cache',      git: 'https://github.com/rtomayko/rack-cache'
 gem 'rack-attack', '~> 6'
 gem 'bunny',           '~> 2.22'
 gem 'dalli'
 gem 'pry'
+gem 'http', '~> 4'
+gem 'metriks',         '0.9.9.6'
+gem 'metriks-librato_metrics', git: 'https://github.com/eric/metriks-librato_metrics'


keep the ones from master(metriks/metriks-librato_metrics

gbarc-dt · 2024-03-19T14:19:41Z

Gemfile

 gem 'stackprof'
 gem "ipaddress", "~> 0.8.3"
 gem 'nakayoshi_fork'
-gem 'sidekiq'
+gem 'sidekiq', '~> 6.4.0'


don't pin the version to 6, current is 7.x

gbarc-dt · 2024-03-19T14:27:43Z

spec/lib/github/services/set_key_spec.rb

@@ -14,7 +14,9 @@
    WebMock.stub_request(:get, "http://vcsfake.travis-ci.com/repos/#{repo.id}/keys?user_id=#{owner.id}")
      .to_return(
        status: 200,
-        body: JSON.dump(keys)
+        body: JSON.dump(


afair its gem version related, keep master

gbarc-dt · 2024-03-19T14:28:40Z

spec/support/billing_spec_helper.rb

@@ -211,6 +211,173 @@ def billing_addon_usage_response_body(attributes = {})
      }.deep_merge(attributes)
    end

+    def billing_v2_subscription_response_body(attributes={})


if billing related and not on master - don't merge

Duplicated. Solved

gbarc-dt · 2024-03-19T14:29:09Z

spec/support/s3.rb

        @key  = key
-        @size = options[:size] || "0"


s3 related updates on master, keep

gbarc-dt · 2024-03-19T14:29:32Z

spec/support/s3.rb

@@ -34,11 +34,11 @@ def list_objects(params = {})
        FakeBucket.new(@contents.select { |o| o.key.start_with? prefix })
      end

-      def add(key, options = {})
-        contents << FakeObject.new(key, options)


keep master for the whole file

gbarc-dt · 2024-03-19T14:29:56Z

spec/v3/billing_client_spec.rb

@@ -306,6 +306,18 @@
    end
  end

+  describe '#pay_v2' do


billing - out

GbArc · 2024-03-26T08:36:06Z

lib/travis/api/v3/billing_client.rb

@@ -96,12 +96,6 @@ def get_invoices_for_subscription(id)
      end
    end

-    def get_invoices_for_v2_subscription(id)


don't remove

GbArc · 2024-03-26T08:36:52Z

lib/travis/api/v3/queries/jobs.rb

+        puts "USING LW JOBS!!\n\n"
+        jobs = V3::Models::Job.where("jobs.id in (select id from most_recent_job_ids_for_user_repositories_by_states_lw(#{user.id}, ?))", states)
+      else
+        puts "USING REGULAR JOBS!!!\n\n"


pls remove these three puts - this was tcie debug

GbArc · 2024-03-26T08:37:45Z

lib/travis/config/defaults.rb

-            database:             { adapter: 'postgresql', database: "travis_#{Travis.env}", encoding: 'unicode', min_messages: 'warning', variables: { statement_timeout: 10_000 } },
-            db:                   { max_statement_timeout_in_seconds: 15, slow_host_max_statement_timeout_in_seconds: 60},
+            database:             { adapter: 'postgresql', database: "travis_#{Travis.env}", encoding: 'unicode', min_messages: 'warning', variables: { statement_timeout: ENV['TRAVIS_DB_STATEMENT_TIMEOUT'] || 10000 } },
+            db:                   { max_statement_timeout_in_seconds: 15, slow_host_max_statement_timeout_in_seconds: ENV['TRAVIS_MAX_DB_STATEMENT_TIMEOUT'] || 15},


change default to 60 like it was before

GbArc · 2024-03-26T08:38:45Z

lib/travis/model/repository.rb

-    else
-      super(value.to_json)
-    end
+    value = value.is_a?(String) ? JSON.parse(value) : value


keep the one from master

GbArc · 2024-03-26T08:39:25Z

spec/support/billing_spec_helper.rb

@@ -211,6 +211,61 @@ def billing_addon_usage_response_body(attributes = {})
      }.deep_merge(attributes)
    end

+    def billing_addons_response_body


duplicate methods

into dt-e3-0-update

…-0-update

DamianSzymanski and others added 30 commits March 18, 2021 19:14

Update OS for enterprise ship:docker

11175e2

gem updates (#1192)

c73e9ee

trivy scan added, docker fix (#1196)

4a759ca

trivy fix

5ee50d2

security updates [ship:docker] (#1200)

ba2c4dc

Co-authored-by: gabriel-arc <[email protected]>

gh update

26be255

update to use latest docker

a89750c

added region to s3 query

82d5198

gh update - gh token fix (#1223)

52adedb

share envs to forks (#1232)

b968fac

* repo settings merge from master

extended default timeouts for db, temp workaround for tcie

40153e7

timeout spec fix

95b0da0

removed trivy

41af887

gem updates (#1237)

6e817cc

w/a: removed set_tags call for raven, todo - migrate to new api'

d8b682f

rack update -> 2.2.3.1

eaefc8a

job query optimization ship:docker (#1240)

c12eb15

console fix after pry update

8d8d693

gem updates + extended access rights for tokens (#1246)

978635f

* github_apps update * activerecord bump to 6.1.6.1 * permit symbol in yaml deserializer for debug

restarted_by feature - merge from master (#1248)

e036f1b

* BSFY-141 merge - add restarted by

putting api on a diet (ship:docker) (#1250)

0bd5566

bump google-protobuf to 3.19.6

ef4b8f8

merge from master (#1260)

a6be270

* bundler update * merge from master 31.10.22 * usr/group update * ship:docker

sinatra up to 2.2.3 (#1264)

cd697da

bump travis-lock, travis-settings

415f12c

simplecov moved to test group

fe48847

sinatra bump to 2.2.4, hostname added for cache queries

edfd3a7

activesupport up to 6.1.7.2

22f7893

managing email subscriptions for whole org

fedd96c

vitalie and others added 4 commits June 26, 2023 18:55

Update gem database_cleaner

9deeb71

Fix for SUPP-725 ship:docker (#1295)

09ac6dd

[BSFY-277] Add tag_name to build request (#1305)

ab08a8c

* Add tag_name to build request * Restrict ruby gem-update version --------- Co-authored-by: piccadilly-circus <[email protected]>

API merge. Enterprise to master.

c567088

SebastianKarpetaDev requested a review from GbArc March 19, 2024 14:15

gbarc-dt reviewed Mar 19, 2024

View reviewed changes

Sebastian Karpeta added 2 commits March 20, 2024 14:25

API merge. Enterprise to master.

b3b45c1

TravisCI API merge. Enterprise to master.

83d6944

GbArc requested changes Mar 26, 2024

View reviewed changes

Sebastian Karpeta and others added 13 commits April 2, 2024 10:44

TravisCI API. Review fixes.

27fec3b

repo spec

063ffb3

specs, ship:docker

e830a80

TravisCI API. Adding libcurl library.

ad89c7b

Merge branch 'dt-e3-0-update' of https://github.com/travis-ci/travis-api

74fb28d

into dt-e3-0-update

libcurl4 ship:docker

e4d67d7

allowance for tcie ship:docker

ec37998

allowance ship:docker

68eef36

Dockerfile revert ship:docker

43ef552

endpoint updates ship:docker

45efe5c

Implement legacy roles option

f435814

test

b192120

Merge remote-tracking branch 'origin/dt-e3-0-legacy-roles' into dt-e3…

5721958

…-0-update

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enterprise to master. #1316

Enterprise to master. #1316

SebastianKarpetaDev commented Mar 19, 2024

gbarc-dt Mar 19, 2024

SebastianKarpetaDev Mar 20, 2024

gbarc-dt Mar 19, 2024

SebastianKarpetaDev Mar 20, 2024

gbarc-dt Mar 19, 2024

SebastianKarpetaDev Mar 20, 2024

gbarc-dt Mar 19, 2024

SebastianKarpetaDev Mar 20, 2024

gbarc-dt Mar 19, 2024

gbarc-dt Mar 19, 2024

SebastianKarpetaDev Mar 20, 2024

gbarc-dt Mar 19, 2024

SebastianKarpetaDev Mar 20, 2024

gbarc-dt Mar 19, 2024

SebastianKarpetaDev Mar 20, 2024

gbarc-dt Mar 19, 2024

gbarc-dt Mar 19, 2024

SebastianKarpetaDev Mar 20, 2024

GbArc Mar 26, 2024

SebastianKarpetaDev Apr 2, 2024

GbArc Mar 26, 2024

SebastianKarpetaDev Apr 2, 2024

GbArc Mar 26, 2024

SebastianKarpetaDev Apr 2, 2024

GbArc Mar 26, 2024

SebastianKarpetaDev Apr 2, 2024

GbArc Mar 26, 2024

SebastianKarpetaDev Apr 2, 2024

Enterprise to master. #1316

Are you sure you want to change the base?

Enterprise to master. #1316

Conversation

SebastianKarpetaDev commented Mar 19, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment