[obs-commits] [openSUSE/open-build-service] 7833c0: Create merge Staging Project method
Branch: refs/heads/master Home: https://github.com/openSUSE/open-build-service Commit: 7833c0ad1f48ba2b2b6fc3406cb75449782e33d5 https://github.com/openSUSE/open-build-service/commit/7833c0ad1f48ba2b2b6fc3... Author: Eduardo Navarro <enavarro@suse.com> Date: 2019-04-01 (Mon, 01 Apr 2019) Changed paths: M src/api/app/models/concerns/staging_project.rb Log Message: ----------- Create merge Staging Project method Co-authored-by: Ana María Martínez Gómez <anamaria@martinezgomez.name> Co-authored-by: Björn Geuken <bgeuken@suse.de> Co-authored-by: Saray Cabrera Padrón <scabrerapadron@suse.de> Co-authored-by: Victor Pereira <vpereira@suse.com> Commit: 109877bf59cf6786b54f389c071cbb9a1fc3b158 https://github.com/openSUSE/open-build-service/commit/109877bf59cf6786b54f38... Author: Björn Geuken <bgeuken@suse.de> Date: 2019-04-01 (Mon, 01 Apr 2019) Changed paths: M src/api/spec/factories/bs_requests.rb Log Message: ----------- Update bs request factory for staging projects Ensure that packages of staged requests are getting copied to the staging project. Commit: f03cb7e1fdad170c1a1ee81f5dd01a3b54c46fdc https://github.com/openSUSE/open-build-service/commit/f03cb7e1fdad170c1a1ee8... Author: Björn Geuken <bgeuken@suse.de> Date: 2019-04-01 (Mon, 01 Apr 2019) Changed paths: M src/api/app/models/concerns/staging_project.rb A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_1.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_2.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_3.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_4.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_5.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_1.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_2.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_3.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_4.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_5.yml A src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_user_has_no_permissions_for_the_target/1_1_7_3_1.yml M src/api/spec/models/project/staging_project_spec.rb Log Message: ----------- Add tests for merge_staged_requests method and extend the code Commit: 4dbf1c51bd824609fdf371ab9ea60a4ed9f8cff8 https://github.com/openSUSE/open-build-service/commit/4dbf1c51bd824609fdf371... Author: Björn Geuken <bgeuken@suse.de> Date: 2019-04-01 (Mon, 01 Apr 2019) Changed paths: M src/api/app/controllers/staging/workflows_controller.rb Log Message: ----------- Verify authorization of staging workflow routes Commit: 0ab87c93800f792c90996769107ece8394081114 https://github.com/openSUSE/open-build-service/commit/0ab87c93800f792c909967... Author: Björn Geuken <bgeuken@suse.de> Date: 2019-04-02 (Tue, 02 Apr 2019) Changed paths: M docs/api/api/api.txt M src/api/app/controllers/staging/staged_requests_controller.rb M src/api/app/controllers/staging/staging_projects_controller.rb A src/api/app/jobs/staging_project_accept_job.rb M src/api/app/models/concerns/staging_project.rb M src/api/config/routes.rb A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_1.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_2.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_3.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_4.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_5.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_1.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_2.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_3.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_4.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_5.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_user_has_no_permissions_for_the_target/1_1_7_3_1.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_1.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_2.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_3.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_4.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_5.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_1.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_2.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_3.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_4.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_5.yml R src/api/spec/cassettes/Project/Staging_Project/_merge_staged_requests/when_the_user_has_no_permissions_for_the_target/1_1_7_3_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/invalid_user/1_3_1_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_and_invalid_request_number/1_3_3_2_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_and_invalid_request_number/1_3_3_2_2.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_and_invalid_request_number/1_3_3_2_3.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_request_number/1_3_3_1_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_request_number/1_3_3_1_2.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_request_number/1_3_3_1_3.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/with_invalid_staging_project/1_3_2_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/with_valid_staging_project_but_staging_project_is_being_merged/1_3_4_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/with_valid_staging_project_but_staging_project_is_being_merged/responds_with_an_error.yml A src/api/spec/cassettes/Staging_StagedRequestsController/GET_index/1_1_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/GET_index/returns_the_staged_requests_xml.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/invalid_user/1_2_1_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/non-existent_staging_project/1_2_2_1.yml M src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_and_invalid_request_number/1_2_3_1.yml M src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_and_invalid_request_number/1_2_3_2.yml R src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_4_1.yml R src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_4_2.yml R src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_4_3.yml R src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_4_4.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_5_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_5_2.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_5_3.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_5_4.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project_but_staging_project_is_being_merged/1_2_4_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project_but_staging_project_is_being_merged/responds_with_an_error.yml A src/api/spec/cassettes/Staging_StagingProjectsController/POST_accept/when_project_is_in_state_acceptable/1_4_2_1.yml A src/api/spec/cassettes/Staging_StagingProjectsController/POST_accept/when_project_is_in_state_acceptable/starts_the_accept_job_for_the_staging_projects.yml A src/api/spec/cassettes/Staging_StagingProjectsController/POST_accept/when_staging_project_is_not_ready_to_be_accepted/1_4_1_1.yml A src/api/spec/cassettes/Staging_StagingProjectsController/POST_accept/when_staging_project_is_not_ready_to_be_accepted/1_4_1_2.yml M src/api/spec/controllers/staging/staged_requests_controller_spec.rb M src/api/spec/controllers/staging/staging_projects_controller_spec.rb M src/api/spec/models/project/staging_project_spec.rb Log Message: ----------- Add API endpoint for merging staging projects Commit: c2943bf6f66fc0ec5958065fa7b3f57cfdc32548 https://github.com/openSUSE/open-build-service/commit/c2943bf6f66fc0ec595806... Author: Henne Vogelsang <hvogel@opensuse.org> Date: 2019-04-02 (Tue, 02 Apr 2019) Changed paths: M src/api/test/functional/backend_test.rb Log Message: ----------- Do not validate accept_staging_projects for now This API is still in beta, we are going to validate XML schemas later. Commit: fc2490a18a3d40ecd8ae8f5e7f20cb704d4a3326 https://github.com/openSUSE/open-build-service/commit/fc2490a18a3d40ecd8ae8f... Author: Henne Vogelsang <hvogel@opensuse.org> Date: 2019-04-02 (Tue, 02 Apr 2019) Changed paths: M dist/Makefile M dist/obs-server.spec M dist/systemd/obs-api-support.target A dist/systemd/obs-delayedjob-queue-staging.service M src/api/app/jobs/staging_project_accept_job.rb Log Message: ----------- Handle staging jobs in their own ActiveJob queue The jobs can be rather long running and shouldn't block other things. Commit: 70d93fa4cc99460627a2dcb51e92c53bb04cebc9 https://github.com/openSUSE/open-build-service/commit/70d93fa4cc99460627a2dc... Author: Björn Geuken <bgeuken@suse.de> Date: 2019-04-02 (Tue, 02 Apr 2019) Changed paths: M src/api/app/controllers/staging/workflows_controller.rb Log Message: ----------- Use the set_staging_workflow for WorkflowsController#destroy ...like we do for the update action. Commit: 86c6c73e2c6ebd10e221a90db287a58216c43363 https://github.com/openSUSE/open-build-service/commit/86c6c73e2c6ebd10e221a9... Author: Victor Pereira <vpereirabr@gmail.com> Date: 2019-04-02 (Tue, 02 Apr 2019) Changed paths: M dist/Makefile M dist/obs-server.spec M dist/systemd/obs-api-support.target A dist/systemd/obs-delayedjob-queue-staging.service M docs/api/api/api.txt M src/api/app/controllers/staging/staged_requests_controller.rb M src/api/app/controllers/staging/staging_projects_controller.rb M src/api/app/controllers/staging/workflows_controller.rb A src/api/app/jobs/staging_project_accept_job.rb M src/api/app/models/concerns/staging_project.rb M src/api/config/routes.rb A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_1.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_2.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_3.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_4.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_in_acceptable_state/1_1_7_1_5.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_1.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_2.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_3.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_4.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_staging_project_is_not_in_state_acceptable/1_1_7_2_5.yml A src/api/spec/cassettes/Project/Staging_Project/_accept_staged_requests/when_the_user_has_no_permissions_for_the_target/1_1_7_3_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/invalid_user/1_3_1_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_and_invalid_request_number/1_3_3_2_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_and_invalid_request_number/1_3_3_2_2.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_and_invalid_request_number/1_3_3_2_3.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_request_number/1_3_3_1_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_request_number/1_3_3_1_2.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/valid_staging_project_and_valid_user/with_valid_request_number/1_3_3_1_3.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/with_invalid_staging_project/1_3_2_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/with_valid_staging_project_but_staging_project_is_being_merged/1_3_4_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/DELETE_destroy/with_valid_staging_project_but_staging_project_is_being_merged/responds_with_an_error.yml A src/api/spec/cassettes/Staging_StagedRequestsController/GET_index/1_1_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/GET_index/returns_the_staged_requests_xml.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/invalid_user/1_2_1_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/non-existent_staging_project/1_2_2_1.yml M src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_and_invalid_request_number/1_2_3_1.yml M src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_and_invalid_request_number/1_2_3_2.yml R src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_4_1.yml R src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_4_2.yml R src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_4_3.yml R src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_4_4.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_5_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_5_2.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_5_3.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project/1_2_5_4.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project_but_staging_project_is_being_merged/1_2_4_1.yml A src/api/spec/cassettes/Staging_StagedRequestsController/POST_create/with_valid_staging_project_but_staging_project_is_being_merged/responds_with_an_error.yml A src/api/spec/cassettes/Staging_StagingProjectsController/POST_accept/when_project_is_in_state_acceptable/1_4_2_1.yml A src/api/spec/cassettes/Staging_StagingProjectsController/POST_accept/when_project_is_in_state_acceptable/starts_the_accept_job_for_the_staging_projects.yml A src/api/spec/cassettes/Staging_StagingProjectsController/POST_accept/when_staging_project_is_not_ready_to_be_accepted/1_4_1_1.yml A src/api/spec/cassettes/Staging_StagingProjectsController/POST_accept/when_staging_project_is_not_ready_to_be_accepted/1_4_1_2.yml M src/api/spec/controllers/staging/staged_requests_controller_spec.rb M src/api/spec/controllers/staging/staging_projects_controller_spec.rb M src/api/spec/factories/bs_requests.rb M src/api/spec/models/project/staging_project_spec.rb M src/api/test/functional/backend_test.rb Log Message: ----------- Merge pull request #7285 from bgeuken/merge-staging-project Merge staging project Compare: https://github.com/openSUSE/open-build-service/compare/f36b2a925bc5...86c6c7...
participants (1)
-
Victor Pereira