Merge pull request #6578 from coolo/add_master

Fix merge conflicts in staging-workflow (again)

.circleci/config.yml

@@ -38,30 +38,14 @@ aliases:
     name: Init submodule
     command: git submodule update --init --recursive --remote
 
+  - &create_test_db
+    name: Create database
+    command: cd src/api; bundle exec rake db:create db:setup RAILS_ENV=test
+
   - &bootstrap_old_test_suite
     name: Setup application
     command: cd src/api; bundle exec rake dev:bootstrap[old_test_suite] RAILS_ENV=test FORCE_EXAMPLE_FILES=1
 
-  - &bootstrap_rspec
-    name: Setup application
-    command: cd src/api; bundle exec rake dev:bootstrap RAILS_ENV=test FORCE_EXAMPLE_FILES=1
-
-  # keep the prefix for the following aligned
-  - &save_repo_cache_key
-    key: v3-repo-{{ .Branch }}-{{ .Revision }}
-
-  - &initial_repo_restore
-    restore_cache:
-      keys:
-        - v3-repo-{{ .Branch }}-{{ .Revision }}
-        - v3-repo-{{ .Branch }}
-        - v3-repo
-
-  - &restore_repo
-    restore_cache:
-      keys:
-        - v3-repo-{{ .Branch }}-{{ .Revision }}
-
   - &store_minitest_artefacts
     store_artifacts:
       path: ./src/api/log/
@@ -78,7 +62,6 @@ jobs:
     docker:
       - <<: *frontend_base
     steps:
-      - *initial_repo_restore
       - checkout
       - run: *install_dependencies
       - run: *install_circle_cli
@@ -99,8 +82,8 @@ jobs:
       - run:
           name: Setup application
           command: cd src/api; bundle exec rake dev:prepare assets:precompile RAILS_ENV=test FORCE_EXAMPLE_FILES=1
-      - save_cache:
-          <<: *save_repo_cache_key
+      - persist_to_workspace:
+          root: .
           paths:
             - .
 
@@ -110,10 +93,11 @@ jobs:
       - <<: *frontend_base
       - <<: *mariadb
     steps:
-      - checkout
+      - attach_workspace:
+         at: .
       - run: *install_dependencies
       - run: *wait_for_database
-      - run: *bootstrap_rspec
+      - run: *create_test_db
       - run: mkdir /home/frontend/rspec
       - run:
           name: Run rspec
@@ -162,7 +146,8 @@ jobs:
       - <<: *frontend_backend
       - <<: *mariadb
     steps:
-      - checkout
+      - attach_workspace:
+         at: .
       - run: *install_dependencies
       - run: *init_git_submodule
       - run: *wait_for_database
@@ -199,7 +184,8 @@ jobs:
       - <<: *frontend_backend
       - <<: *mariadb
     steps:
-      - checkout
+      - attach_workspace:
+         at: .
       - run: *install_dependencies
       - run: *init_git_submodule
       - run: *wait_for_database
@@ -214,7 +200,8 @@ jobs:
       - image: *backend
     working_directory: /home/frontend/project
     steps:
-      - checkout
+      - attach_workspace:
+         at: .
       - run: *init_git_submodule
       - run:
           name: backend
@@ -225,10 +212,9 @@ jobs:
       - <<: *frontend_base
 
     steps:
-      - checkout
-      - run: *install_dependencies
       - attach_workspace:
          at: .
+      - run: *install_dependencies
       - run:
           name: Merge and check coverage
           command: |

dist/obsstoragesetup

@@ -78,10 +78,9 @@ case "$1" in
 				echo "Enabling sshd as requested"
 				[ -e /root/.ssh ] || mkdir /root/.ssh
 				curl $OBS_ROOT_SSHD_KEY_URL > /root/.ssh/authorized_keys
-				insserv sshd
-				# avoid dead lock in systemctl
-				export SYSTEMCTL_OPTIONS=--ignore-dependencies
-				rcsshd start
+				systemctl enable sshd.service
+				# probably not needed any more
+				#systemctl --ignore-dependencies restart sshd.service
 			fi
 		fi
 

dist/t/spec/features/0030_project_spec.rb

@@ -13,7 +13,7 @@
     within("div#subheader") do
       click_link('Create Home')
     end
-    click_button('Create Project')
+    first('input[type=submit]').click # 'Create Project' for 2.8 and 2.9. 'Accept' for master
     expect(page).to have_content("Project 'home:Admin' was created successfully")
   end
 

src/api/.rubocop.yml

@@ -53,6 +53,12 @@ RSpec/FilePath:
   Exclude:
     - 'spec/models/obs_factory/distribution_strategy_opensuse_leap15_spec.rb'
 
+# We sometimes have a lot of expectations when testing complete workflows
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'spec/features/**/*.rb'
+    - 'spec/bootstrap/features/**/*.rb'
+
 Rails/HasAndBelongsToMany:
   Enabled: false
 

src/api/.rubocop_todo.yml

@@ -95,7 +95,6 @@ Layout/SpaceAroundOperators:
     - 'spec/controllers/webui/search_controller_spec.rb'
     - 'spec/features/webui/packages_spec.rb'
     - 'test/functional/attributes_test.rb'
-    - 'test/functional/group_request_test.rb'
     - 'test/functional/search_controller_test.rb'
 
 # Offense count: 23

src/api/Gemfile

@@ -77,7 +77,7 @@ gem 'addressable'
 # for XML builder
 gem 'builder'
 # to write the rails metrics directly into InfluxDB.
-gem 'influxdb-rails', '>=1.0.0.beta1'
+gem 'influxdb-rails', '>=1.0.0.beta2'
 
 group :development, :production do
   # to have the delayed job daemon

src/api/Gemfile.lock

@@ -1,47 +1,47 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.1.1)
-      actionpack (= 5.2.1.1)
+    actioncable (5.2.2)
+      actionpack (= 5.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.1.1)
-      actionpack (= 5.2.1.1)
-      actionview (= 5.2.1.1)
-      activejob (= 5.2.1.1)
+    actionmailer (5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.1.1)
-      actionview (= 5.2.1.1)
-      activesupport (= 5.2.1.1)
+    actionpack (5.2.2)
+      actionview (= 5.2.2)
+      activesupport (= 5.2.2)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.1.1)
-      activesupport (= 5.2.1.1)
+    actionview (5.2.2)
+      activesupport (= 5.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.1.1)
-      activesupport (= 5.2.1.1)
+    activejob (5.2.2)
+      activesupport (= 5.2.2)
       globalid (>= 0.3.6)
-    activemodel (5.2.1.1)
-      activesupport (= 5.2.1.1)
+    activemodel (5.2.2)
+      activesupport (= 5.2.2)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.2.1.1)
-      activemodel (= 5.2.1.1)
-      activesupport (= 5.2.1.1)
+    activerecord (5.2.2)
+      activemodel (= 5.2.2)
+      activesupport (= 5.2.2)
       arel (>= 9.0)
-    activestorage (5.2.1.1)
-      actionpack (= 5.2.1.1)
-      activerecord (= 5.2.1.1)
+    activestorage (5.2.2)
+      actionpack (= 5.2.2)
+      activerecord (= 5.2.2)
       marcel (~> 0.3.1)
-    activesupport (5.2.1.1)
+    activesupport (5.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -59,7 +59,7 @@ GEM
     ansi (1.5.0)
     arel (9.0.0)
     ast (2.4.0)
-    autoprefixer-rails (9.3.1)
+    autoprefixer-rails (9.4.2)
       execjs
     bcrypt (3.1.12)
     bootstrap (4.1.3)
@@ -70,12 +70,12 @@ GEM
     bullet (5.9.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    bunny (2.12.0)
+    bunny (2.12.1)
       amq-protocol (~> 2.3, >= 2.3.0)
     bunny-mock (1.7.0)
       bunny (>= 1.7)
     byebug (10.0.2)
-    capybara (3.11.1)
+    capybara (3.12.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -176,10 +176,10 @@ GEM
       ruby_parser (~> 3.5)
     i18n (1.1.1)
       concurrent-ruby (~> 1.0)
-    influxdb (0.5.3)
-    influxdb-rails (1.0.0.beta1)
-      influxdb (~> 0.5.0)
-      railties (> 3)
+    influxdb (0.6.4)
+    influxdb-rails (1.0.0.beta2)
+      influxdb (~> 0.6, >= 0.6.4)
+      railties (>= 4.2)
     innertube (1.1.0)
     jaro_winkler (1.5.1)
     joiner (0.4.2)
@@ -281,33 +281,33 @@ GEM
     rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.1.1)
-      actioncable (= 5.2.1.1)
-      actionmailer (= 5.2.1.1)
-      actionpack (= 5.2.1.1)
-      actionview (= 5.2.1.1)
-      activejob (= 5.2.1.1)
-      activemodel (= 5.2.1.1)
-      activerecord (= 5.2.1.1)
-      activestorage (= 5.2.1.1)
-      activesupport (= 5.2.1.1)
+    rails (5.2.2)
+      actioncable (= 5.2.2)
+      actionmailer (= 5.2.2)
+      actionpack (= 5.2.2)
+      actionview (= 5.2.2)
+      activejob (= 5.2.2)
+      activemodel (= 5.2.2)
+      activerecord (= 5.2.2)
+      activestorage (= 5.2.2)
+      activesupport (= 5.2.2)
       bundler (>= 1.3.0)
-      railties (= 5.2.1.1)
+      railties (= 5.2.2)
       sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
+    rails-controller-testing (1.0.4)
+      actionpack (>= 5.0.1.x)
+      actionview (>= 5.0.1.x)
+      activesupport (>= 5.0.1.x)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
     rails_tokeninput (1.7.0)
       railties (>= 3.1.0)
-    railties (5.2.1.1)
-      actionpack (= 5.2.1.1)
-      activesupport (= 5.2.1.1)
+    railties (5.2.2)
+      actionpack (= 5.2.2)
+      activesupport (= 5.2.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
@@ -349,7 +349,7 @@ GEM
     rspec-support (3.8.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.60.0)
+    rubocop (0.61.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
@@ -361,7 +361,7 @@ GEM
       rubocop (>= 0.60.0)
     ruby-ldap (0.9.20)
     ruby-progressbar (1.10.0)
-    ruby_parser (3.11.0)
+    ruby_parser (3.12.0)
       sexp_processor (~> 4.9)
     rubyzip (1.2.2)
     safe_yaml (1.0.4)
@@ -408,7 +408,7 @@ GEM
     temple (0.8.0)
     term-ansicolor (1.7.0)
       tins (~> 1.0)
-    test-unit (3.2.8)
+    test-unit (3.2.9)
       power_assert
     thinking-sphinx (4.0.0)
       activerecord (>= 3.1.0)
@@ -419,7 +419,7 @@ GEM
       riddle (~> 2.3)
     thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.9)
     timecop (0.9.1)
     tins (1.20.2)
     tzinfo (1.2.5)
@@ -488,7 +488,7 @@ DEPENDENCIES
   haml
   haml-rails
   haml_lint
-  influxdb-rails (>= 1.0.0.beta1)
+  influxdb-rails (>= 1.0.0.beta2)
   jquery-datatables
   jquery-rails
   jquery-ui-rails (~> 4.2.1)

src/api/app/assets/javascripts/webui/application/requests_table.js.erb

@@ -15,7 +15,7 @@ $( document ).ready(function() {
         // First column has index 0.
         { orderable: false, targets: [6] }
       ],
-      paging: 25,
+      paging: true,
       pageLength: 25,
       pagingType: "full_numbers",
       processing: true,

src/api/app/assets/javascripts/webui2/application.js

@@ -42,3 +42,4 @@
 //= require webui2/cm2/use-codemirror.js
 //= require webui2/package-view_file.js
 //= require webui2/staging_workflow.js
+//= require webui2/project_monitor.js