diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 9f779e6bbeb..51d7b03cfb5 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -3019,8 +3019,6 @@ changes: - ".gitlab/ci/test-metadata.gitlab-ci.yml" - "scripts/rspec_helpers.sh" - when: manual - allow_failure: true - <<: *if-merge-request-not-approved when: never - <<: *if-merge-request @@ -3362,25 +3360,14 @@ - <<: *if-merge-request-labels-run-observability-e2e-tests-current-branch when: never - <<: *if-merge-request-labels-run-observability-e2e-tests-main-branch - allow_failure: true - <<: *if-merge-request changes: *observability-code-patterns - allow_failure: true - - <<: *if-merge-request - changes: *code-patterns - when: manual - allow_failure: true .observability-backend-current-branch:rules: rules: - <<: *if-merge-request-labels-run-observability-e2e-tests-main-branch when: never - <<: *if-merge-request-labels-run-observability-e2e-tests-current-branch - allow_failure: true - - <<: *if-merge-request - changes: *code-patterns - when: manual - allow_failure: true ########################## # Pre-merge checks rules # diff --git a/.gitlab/ci/test-metadata.gitlab-ci.yml b/.gitlab/ci/test-metadata.gitlab-ci.yml index 22b08bcf2e4..81a5fe917dc 100644 --- a/.gitlab/ci/test-metadata.gitlab-ci.yml +++ b/.gitlab/ci/test-metadata.gitlab-ci.yml @@ -1,7 +1,4 @@ .tests-metadata-state: - image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION} - before_script: - - source scripts/utils.sh artifacts: expire_in: 31d paths: @@ -13,21 +10,26 @@ retrieve-tests-metadata: extends: - .tests-metadata-state + - .fast-no-clone-job - .test-metadata:rules:retrieve-tests-metadata # We use a smaller image for this job only (update-tests-metadata compiles some gems) - image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}-slim + image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION}-alpine3.20 stage: prepare needs: [] + variables: + FILES_TO_DOWNLOAD: > + scripts/setup/tests-metadata.rb + before_script: + - apk add --no-cache --update curl # Not present in ruby-alpine, so we add it manually + - !reference [".fast-no-clone-job", before_script] script: - - apt-get update && apt-get install -y curl # Not present in ruby-slim, so we add it manually - - install_gitlab_gem - - source ./scripts/rspec_helpers.sh - - retrieve_tests_metadata + - ruby scripts/setup/tests-metadata.rb retrieve update-tests-metadata: extends: - .tests-metadata-state - .test-metadata:rules:update-tests-metadata + image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION} stage: post-test needs: - job: retrieve-tests-metadata @@ -42,9 +44,27 @@ update-tests-metadata: optional: true - job: rspec:artifact-collector ee remainder optional: true + variables: + FLAKY_RSPEC_GENERATE_REPORT: "true" script: - - run_timed_command "retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document" - - source ./scripts/rspec_helpers.sh + - source scripts/utils.sh + - source scripts/rspec_helpers.sh - test -f "${FLAKY_RSPEC_SUITE_REPORT_PATH}" || echo -e "\e[31m" 'Consider add ~"pipeline:run-all-rspec" to run full rspec jobs' "\e[0m" + - run_timed_command "retry gem install fog-aws mime-types activesupport rspec_profiling postgres-copy --no-document" - update_tests_metadata - update_tests_mapping + +verify-tests-metadata: + extends: + - .default-retry + - .ruby-cache + - .test-metadata:rules:update-tests-metadata + image: ${GITLAB_DEPENDENCY_PROXY_ADDRESS}ruby:${RUBY_VERSION} + stage: post-test + needs: + - update-tests-metadata + before_script: + - source scripts/utils.sh + - bundle_install_script + script: + - bundle exec scripts/setup/tests-metadata.rb verify diff --git a/.gitlab/ci/version.yml b/.gitlab/ci/version.yml index 0c13cae4546..f2c13e0f8aa 100644 --- a/.gitlab/ci/version.yml +++ b/.gitlab/ci/version.yml @@ -5,7 +5,7 @@ variables: EXIFTOOL_VERSION: "12.60" GCLOUD_VERSION: "413" GIT_VERSION: "2.45" - GO_VERSION: "1.22" + GO_VERSION: "1.23" GRAPHICSMAGICK_VERSION: "1.3.36" HELM_VERSION: "3.16" KIND_VERSION: "0.24" diff --git a/app/assets/javascripts/work_items/components/create_work_item.vue b/app/assets/javascripts/work_items/components/create_work_item.vue index 3317bd9708c..bcab1d96e93 100644 --- a/app/assets/javascripts/work_items/components/create_work_item.vue +++ b/app/assets/javascripts/work_items/components/create_work_item.vue @@ -173,6 +173,7 @@ export default { workItemType?.widgetDefinitions, workItemType.name, workItemType.id, + workItemType.iconName, ); this.selectedWorkItemTypeId = workItemType?.id; } else { @@ -182,6 +183,7 @@ export default { workItemType?.widgetDefinitions, workItemType.name, workItemType.id, + workItemType.iconName, ); }); this.showWorkItemTypeSelect = true; @@ -234,6 +236,9 @@ export default { selectedWorkItemTypeName() { return this.selectedWorkItemType?.name; }, + selectedWorkItemTypeIconName() { + return this.selectedWorkItemType?.iconName; + }, formOptions() { return [{ value: null, text: s__('WorkItem|Select type') }, ...this.workItemTypesForSelect]; }, @@ -486,6 +491,7 @@ export default { selectedWorkItemWidgets, this.selectedWorkItemTypeName, this.selectedWorkItemTypeId, + this.selectedWorkItemTypeIconName, ); }, }, diff --git a/app/assets/javascripts/work_items/components/create_work_item_modal.vue b/app/assets/javascripts/work_items/components/create_work_item_modal.vue index fb904ea0d23..6ff8c6a6a37 100644 --- a/app/assets/javascripts/work_items/components/create_work_item_modal.vue +++ b/app/assets/javascripts/work_items/components/create_work_item_modal.vue @@ -108,6 +108,7 @@ export default { this.workItemTypes[0]?.widgetDefinitions, this.workItemTypeName, this.workItemTypes[0]?.id, + this.workItemTypes[0]?.iconName, ); }, error() { @@ -169,6 +170,7 @@ export default { this.workItemTypes[0]?.widgetDefinitions, this.workItemTypeName, this.workItemTypes[0]?.id, + this.workItemTypes[0]?.iconName, ); } this.hideModal(); diff --git a/app/assets/javascripts/work_items/components/work_item_created_updated.vue b/app/assets/javascripts/work_items/components/work_item_created_updated.vue index f8c0b419350..223e2b7ed49 100644 --- a/app/assets/javascripts/work_items/components/work_item_created_updated.vue +++ b/app/assets/javascripts/work_items/components/work_item_created_updated.vue @@ -62,6 +62,9 @@ export default { isWorkItemConfidential() { return this.workItem?.confidential; }, + isLoading() { + return this.$apollo.queries.workItem.loading; + }, }, apollo: { // eslint-disable-next-line @gitlab/vue-no-undef-apollo-properties @@ -86,7 +89,10 @@ export default {