diff --git a/.gitlab/ci/global.gitlab-ci.yml b/.gitlab/ci/global.gitlab-ci.yml index da4282e8838..cecbd654f9d 100644 --- a/.gitlab/ci/global.gitlab-ci.yml +++ b/.gitlab/ci/global.gitlab-ci.yml @@ -468,6 +468,21 @@ - !reference [.db-services-with-auto-explain, services] - !reference [.es8-services, services] +.opensearch-latest-services: + services: + - !reference [.zoekt-services, services] + - name: opensearchproject/opensearch:latest + alias: elasticsearch + command: ["bin/opensearch", "-E", "discovery.type=single-node", "-E", "plugins.security.disabled=true", "-E", "cluster.routing.allocation.disk.threshold_enabled=false"] + +.use-pg16-opensearch-latest-ee: + extends: + - .use-pg16 + - .zoekt-variables + services: + - !reference [.db-services-with-auto-explain, services] + - !reference [.opensearch-latest-services, services] + .os1-services: services: - !reference [.zoekt-services, services] diff --git a/.gitlab/ci/rails.gitlab-ci.yml b/.gitlab/ci/rails.gitlab-ci.yml index 9c361dd52c3..2ccbe33cc63 100644 --- a/.gitlab/ci/rails.gitlab-ci.yml +++ b/.gitlab/ci/rails.gitlab-ci.yml @@ -650,9 +650,15 @@ rspec:merge-auto-explain-logs: script: - scripts/merge-auto-explain-logs - | - if [[ -f "$RSPEC_AUTO_EXPLAIN_LOG_PATH" ]] && [[ "$CI_PROJECT_PATH" == "gitlab-org/gitlab" ]] && [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then - source scripts/gitlab_component_helpers.sh - extract_and_upload_fingerprints + if [[ -f "$RSPEC_AUTO_EXPLAIN_LOG_PATH" ]] && [[ "$CI_PROJECT_PATH" == "gitlab-org/gitlab" ]]; then + if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then + # For the default branch (e.g., master), extract and upload fingerprints + source scripts/gitlab_component_helpers.sh + extract_and_upload_fingerprints + else + # For MRs, compare against master fingerprints and generate a report + scripts/merge_request_query_differ.rb "$RSPEC_AUTO_EXPLAIN_LOG_PATH" + fi fi artifacts: name: auto-explain-logs @@ -1213,6 +1219,35 @@ rspec-ee system pg17: # EE: default branch nightly scheduled jobs # ##################################### +################################################## +# EE: default branch weekly scheduled jobs # +# Integration tests with latest OpenSearch versions +# and the actual PG production version (PG16) + +rspec-ee unit pg16 opensearch-latest: + extends: + - .rspec-base-pg16 + - .rspec-ee-base-pg16-opensearch-latest + - .rspec-ee-unit-parallel + - .rails:rules:default-branch-schedule-weekly--code-backstage-ee-only + +rspec-ee integration pg16 opensearch-latest: + extends: + - .rspec-base-pg16 + - .rspec-ee-base-pg16-opensearch-latest + - .rspec-ee-integration-parallel + - .rails:rules:default-branch-schedule-weekly--code-backstage-ee-only + +rspec-ee system pg16 opensearch-latest: + extends: + - .rspec-base-pg16 + - .rspec-ee-base-pg16-opensearch-latest + - .rspec-ee-system-parallel + - .rails:rules:default-branch-schedule-weekly--code-backstage-ee-only + +# EE: default branch weekly scheduled jobs # +################################################## + ################################################## # EE: Canonical MR pipelines .rspec-fail-fast: diff --git a/.gitlab/ci/rails/shared.gitlab-ci.yml b/.gitlab/ci/rails/shared.gitlab-ci.yml index 7c27162e0fd..4b7502a24da 100644 --- a/.gitlab/ci/rails/shared.gitlab-ci.yml +++ b/.gitlab/ci/rails/shared.gitlab-ci.yml @@ -291,6 +291,11 @@ include: - .use-pg16-es8-ee - .rails:rules:run-search-tests +.rspec-ee-base-pg16-opensearch-latest: + extends: + - .rspec-base + - .use-pg16-opensearch-latest-ee + .rspec-ee-base-pg16-opensearch1: extends: - .rspec-base diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index fb64125fbc1..f0814cfb2cf 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -192,6 +192,9 @@ .if-default-branch-schedule-nightly: &if-default-branch-schedule-nightly if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "nightly"' +.if-default-branch-schedule-weekly: &if-default-branch-schedule-weekly + if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "weekly"' + .if-ruby-branch-schedule-nightly: &if-ruby-branch-schedule-nightly if: '$CI_COMMIT_BRANCH == "ruby-next" && $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "nightly"' @@ -851,6 +854,8 @@ rules: - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request changes: *core-backend-patterns @@ -1081,6 +1086,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-ruby-branch - <<: *if-rails-next-branch - <<: *if-force-ci @@ -1123,6 +1130,8 @@ - !reference [".qa:rules:e2e-test-never-run", rules] - <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule when: never + - <<: *if-default-branch-schedule-weekly # already executed in the 2-hourly schedule + when: never - <<: *if-default-branch-refs - <<: *if-merge-request-labels-run-all-e2e - <<: *if-merge-request-labels-run-cs-evaluation @@ -1228,6 +1237,8 @@ ###################### .ci-templates:rules:shellcheck: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *ci-templates-patterns - <<: *if-default-refs @@ -1252,6 +1263,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *code-backstage-patterns @@ -1272,6 +1285,8 @@ .docs:rules:docs-lint: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *docs-patterns @@ -1282,6 +1297,8 @@ .docs:rules:deprecations-and-removals: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *docs-deprecations-and-removals-patterns @@ -1296,6 +1313,8 @@ rules: - <<: *if-not-ee when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *code-backstage-qa-patterns @@ -1306,6 +1325,8 @@ rules: - <<: *if-not-ee when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *code-rest-api-patterns @@ -1316,6 +1337,8 @@ rules: - <<: *if-not-ee when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *audit-events-patterns @@ -1326,6 +1349,8 @@ rules: - <<: *if-not-ee when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *custom-roles-patterns @@ -1336,6 +1361,8 @@ rules: - <<: *if-not-ee when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *ci-job-token-policies-patterns @@ -1386,6 +1413,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - if: '$ENABLE_COMPILE_PRODUCTION_ASSETS == "true"' - <<: *if-tag - <<: *if-sync-changes-on-stable-branches @@ -1428,6 +1457,8 @@ rules: - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - if: '$ENABLE_JEST_INTEGRATION == "true"' - if: '$ENABLE_RSPEC_FRONTEND_FIXTURE == "true"' - if: '$ENABLE_ESLINT == "true"' @@ -1458,6 +1489,8 @@ # From .frontend:rules:default-frontend-jobs - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-fork-merge-request changes: *code-backstage-patterns - if: '$ENABLE_RSPEC_FRONTEND_FIXTURE == "true"' @@ -1488,6 +1521,8 @@ # .frontend:rules:default-frontend-jobs, with a additional rules when MR is not approved .frontend:rules:compile-storybook: rules: + - <<: *if-default-branch-schedule-weekly + when: never # From .frontend:rules:default-frontend-jobs - <<: *if-merge-request-labels-pipeline-expedite when: never @@ -1512,6 +1547,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-dot-com-gitlab-org-default-branch changes: *code-backstage-patterns - <<: *if-merge-request-not-approved @@ -1529,6 +1566,8 @@ when: never - <<: *if-fork-merge-request when: never + - <<: *if-default-branch-schedule-weekly + when: never - if: '$ENABLE_JEST == "true"' - <<: *if-automated-merge-request changes: *code-backstage-patterns @@ -1568,6 +1607,8 @@ # From .frontend:rules:default-frontend-jobs - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - if: '$ENABLE_JEST_INTEGRATION == "true"' - <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request-labels-frontend-and-feature-flag @@ -1588,6 +1629,8 @@ when: never - <<: *if-merge-request when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-branch-refs changes: *code-backstage-patterns @@ -1597,6 +1640,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-branch-refs changes: *frontend-build-patterns allow_failure: true @@ -1635,6 +1680,8 @@ .frontend:rules:jest-linters: rules: - <<: *if-merge-request-labels-run-all-jest + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: ["tooling/eslint-config/**/*", "spec/tooling/frontend/eslint-config/**/*"] @@ -1681,6 +1728,8 @@ ############ .qa:rules:update-gem-cache: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-train when: never - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/ || $CI_COMMIT_REF_NAME =~ /^\d+-\d+-auto-deploy-\d+$/ || $CI_COMMIT_REF_NAME =~ /^security\//' @@ -1700,6 +1749,8 @@ .qa:rules:update-orchestrator-gem-cache: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-train when: never - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_REF_NAME =~ /^[\d-]+-stable(-ee)?$/ || $CI_COMMIT_REF_NAME =~ /^\d+-\d+-auto-deploy-\d+$/ || $CI_COMMIT_REF_NAME =~ /^security\//' @@ -1713,6 +1764,8 @@ .qa:rules:metadata-lint: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *qa-patterns - <<: *if-default-refs @@ -1720,6 +1773,8 @@ .qa:rules:gitlab-orchestrator: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request changes: *gitlab-orchestrator-patterns - <<: *if-merge-request @@ -1752,12 +1807,16 @@ .qa:rules:internal: rules: + - <<: *if-default-branch-schedule-weekly + when: never - if: '$ENABLE_QA_INTERNAL == "true"' - <<: *if-default-refs changes: *qa-patterns .qa:rules:selectors: rules: + - <<: *if-default-branch-schedule-weekly + when: never - if: '$ENABLE_QA_SELECTORS == "true"' - <<: *if-default-refs changes: *code-qa-patterns @@ -1768,6 +1827,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - *if-ruby-branch - *if-rails-next-branch - *if-merge-request-labels-run-all-e2e @@ -1805,6 +1866,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never # primary triggers for e2e tests .qa:rules:e2e-blocking-base-before: @@ -1954,6 +2017,8 @@ when: never - <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule when: never + - <<: *if-default-branch-schedule-weekly # already executed in the 2-hourly schedule + when: never - !reference [".qa:rules:e2e-blocking-base-before", rules] # Run tests automatically for MRs that touch Ruby version files - <<: *if-merge-request @@ -2135,6 +2200,8 @@ rules: - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-run-all-rspec - <<: *if-default-refs changes: *db-backup-patterns @@ -2176,6 +2243,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - if: '$ENABLE_RSPEC_MIGRATION == "true"' - <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request @@ -2354,6 +2423,8 @@ .rails:rules:ee-and-foss-fast_spec_helper: rules: - if: '$ENABLE_RSPEC_FAST_SPEC_HELPER == "true"' + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request changes: *backend-patterns @@ -2374,6 +2445,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-run-all-rspec - <<: *if-merge-request changes: *core-backend-patterns @@ -2553,10 +2626,12 @@ .rails:rules:default-branch-schedule-nightly--code-backstage-default-rules: rules: - - <<: *if-merge-request-labels-pipeline-expedite - when: never - <<: *if-default-branch-schedule-nightly +.rails:rules:default-branch-schedule-weekly--code-backstage-default-rules: + rules: + - <<: *if-default-branch-schedule-weekly + .rails:rules:default-branch-schedule-nightly--code-backstage: rules: - !reference [".rails:rules:default-branch-schedule-nightly--code-backstage-default-rules", rules] @@ -2567,10 +2642,18 @@ when: never - !reference [".rails:rules:default-branch-schedule-nightly--code-backstage-default-rules", rules] +.rails:rules:default-branch-schedule-weekly--code-backstage-ee-only: + rules: + - <<: *if-not-ee + when: never + - !reference [".rails:rules:default-branch-schedule-weekly--code-backstage-default-rules", rules] + .rails:rules:rspec-feature-flags: rules: - <<: *if-not-ee when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-pipeline-expedite when: never - <<: *if-default-refs @@ -2584,6 +2667,8 @@ when: never - if: '$FAST_QUARANTINE == "false" && $RETRY_FAILED_TESTS_IN_NEW_PROCESS != "true"' when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-branch-refs changes: *code-backstage-patterns when: always @@ -2600,6 +2685,8 @@ .static-analysis:rules:static-analysis: rules: - if: '$ENABLE_STATIC_ANALYSIS == "true"' + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *code-backstage-qa-patterns - <<: *if-default-refs @@ -2607,12 +2694,16 @@ .static-analysis:rules:static-verification-with-database: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *code-backstage-qa-patterns .static-analysis:rules:rubocop: rules: - if: '$ENABLE_RUBOCOP == "true"' + - <<: *if-default-branch-schedule-weekly + when: never # Do not run full rubocop if the merge request isn't approved - <<: *if-merge-request-not-approved changes: *rubocop-patterns @@ -2627,6 +2718,8 @@ .static-analysis:rules:ensure-application-settings-have-definition-file: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: - db/structure.sql @@ -2634,6 +2727,8 @@ .static-analysis:rules:haml-lint: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *rubocop-patterns - <<: *if-default-refs @@ -2704,6 +2799,8 @@ ################# .reports:rules:code_quality: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-pipeline-expedite when: never - if: '$CODE_QUALITY_DISABLED' @@ -2723,6 +2820,8 @@ .reports:rules:semgrep-sast: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-pipeline-expedite when: never - if: $SAST_DISABLED @@ -2742,6 +2841,8 @@ .reports:rules:secret_detection: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-pipeline-expedite when: never - if: '$SECRET_DETECTION_DISABLED' @@ -2753,6 +2854,8 @@ .reports:rules:gemnasium-dependency_scanning: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-pipeline-expedite when: never - if: '$DEPENDENCY_SCANNING_DISABLED || $GITLAB_FEATURES !~ /\bdependency_scanning\b/ || $DS_EXCLUDED_ANALYZERS =~ /gemnasium([^-]|$)/' @@ -2764,6 +2867,8 @@ .reports:rules:gemnasium-python-dependency_scanning: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request-labels-pipeline-expedite when: never - if: '$DEPENDENCY_SCANNING_DISABLED || $GITLAB_FEATURES !~ /\bdependency_scanning\b/ || $DS_EXCLUDED_ANALYZERS =~ /gemnasium-python/' @@ -2805,6 +2910,8 @@ when: never - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-merge-request changes: - '{,ee/}app/**/*.{js,vue,rb,haml}' @@ -2980,6 +3087,8 @@ rules: - <<: *if-merge-request-labels-pipeline-expedite when: never + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *code-backstage-patterns @@ -3110,6 +3219,8 @@ ################### .workhorse:rules:workhorse: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *workhorse-patterns @@ -3118,16 +3229,22 @@ ################### .yaml-lint:rules: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *yaml-lint-patterns .lint-pipeline-yaml:rules: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *lint-pipeline-yaml-patterns .lint-metrics-yaml:rules: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *lint-metrics-yaml-patterns @@ -3429,6 +3546,8 @@ ################### .benchmark:rules:benchmark-markdown: rules: + - <<: *if-default-branch-schedule-weekly + when: never - <<: *if-default-refs changes: *setup-test-env-patterns when: manual diff --git a/.rubocop_todo/rspec/be_eq.yml b/.rubocop_todo/rspec/be_eq.yml index 04713d08053..a5d13e9bec7 100644 --- a/.rubocop_todo/rspec/be_eq.yml +++ b/.rubocop_todo/rspec/be_eq.yml @@ -313,7 +313,6 @@ RSpec/BeEq: - 'ee/spec/requests/api/graphql/audit_events/streaming/http/namespace_filters/create_spec.rb' - 'ee/spec/requests/api/graphql/audit_events/streaming/instance_headers/create_spec.rb' - 'ee/spec/requests/api/graphql/boards/boards_query_spec.rb' - - 'ee/spec/requests/api/graphql/gitlab_subscriptions/add_on_purchase_spec.rb' - 'ee/spec/requests/api/graphql/gitlab_subscriptions/namespaces/add_on_purchase_spec.rb' - 'ee/spec/requests/api/graphql/group/ci_cd_settings_spec.rb' - 'ee/spec/requests/api/graphql/group/dast_profile_schedule_spec.rb' diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml index 60c08c3ac03..024b0d8c858 100644 --- a/.rubocop_todo/rspec/feature_category.yml +++ b/.rubocop_todo/rspec/feature_category.yml @@ -1701,7 +1701,6 @@ RSpec/FeatureCategory: - 'spec/helpers/export_helper_spec.rb' - 'spec/helpers/external_link_helper_spec.rb' - 'spec/helpers/feature_flags_helper_spec.rb' - - 'spec/helpers/git_helper_spec.rb' - 'spec/helpers/gitlab_routing_helper_spec.rb' - 'spec/helpers/gitlab_script_tag_helper_spec.rb' - 'spec/helpers/graph_helper_spec.rb' diff --git a/app/assets/javascripts/ci/common/pipeline_inputs/pipeline_inputs_form.vue b/app/assets/javascripts/ci/common/pipeline_inputs/pipeline_inputs_form.vue index 1b75eb7c04e..9cd6501a5bc 100644 --- a/app/assets/javascripts/ci/common/pipeline_inputs/pipeline_inputs_form.vue +++ b/app/assets/javascripts/ci/common/pipeline_inputs/pipeline_inputs_form.vue @@ -59,9 +59,7 @@ export default { })); }, error(error) { - createAlert({ - message: s__('Pipelines|There was a problem fetching the pipeline inputs.'), - }); + this.createErrorAlert(error); reportToSentry(this.$options.name, error); }, }, @@ -98,6 +96,14 @@ export default { this.$emit('update-inputs', nameValuePairs); }, + createErrorAlert(error) { + const graphQLErrors = error?.graphQLErrors?.map((err) => err.message) || []; + const message = graphQLErrors.length + ? graphQLErrors.join(', ') + : s__('Pipelines|There was a problem fetching the pipeline inputs. Please try again.'); + + createAlert({ message }); + }, }, }; diff --git a/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue b/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue index f10587d527d..254c6e17673 100644 --- a/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue +++ b/app/assets/javascripts/ml/model_registry/apps/show_ml_model.vue @@ -17,6 +17,7 @@ import CandidateList from '~/ml/model_registry/components/candidate_list.vue'; import DeleteModelDisclosureDropdownItem from '../components/delete_model_disclosure_dropdown_item.vue'; import LoadOrErrorOrShow from '../components/load_or_error_or_show.vue'; import DeleteModel from '../components/functional/delete_model.vue'; +import SidebarItem from '../components/model_sidebar_item.vue'; const ROUTE_DETAILS = 'details'; const ROUTE_VERSIONS = 'versions'; @@ -64,6 +65,7 @@ export default { GlSprintf, GlIcon, GlLink, + SidebarItem, }, mixins: [timeagoMixin], router: new VueRouter({ @@ -290,7 +292,7 @@ export default {
- +
-
-
-
{{ $options.i18n.authorTitle }}
-
+
+ +
{{ $options.i18n.noneText }}
-
-
-
- {{ $options.i18n.experimentTitle }} -
-
+ + + +
-
-
-
{{ $options.i18n.latestVersionTitle }}
-
+ + + +
{{ $options.i18n.noneText }}
-
-
-
{{ $options.i18n.versionCountTitle }}
-
+ + + +
{{ versionCount }} {{ $options.i18n.noneText }}
-
+
diff --git a/app/assets/javascripts/ml/model_registry/components/model_detail.vue b/app/assets/javascripts/ml/model_registry/components/model_detail.vue index 7a20e8f1496..3a2c1260a20 100644 --- a/app/assets/javascripts/ml/model_registry/components/model_detail.vue +++ b/app/assets/javascripts/ml/model_registry/components/model_detail.vue @@ -60,16 +60,14 @@ export default { diff --git a/app/assets/javascripts/projects/new_v2/form_constants.js b/app/assets/javascripts/projects/new_v2/form_constants.js new file mode 100644 index 00000000000..e0000e26344 --- /dev/null +++ b/app/assets/javascripts/projects/new_v2/form_constants.js @@ -0,0 +1,64 @@ +import { s__ } from '~/locale'; + +export const K8S_OPTION = { + value: 'kubernetes', + text: s__('DeploymentTarget|Kubernetes (GKE, EKS, OpenShift, and so on)'), +}; + +export const DEPLOYMENT_TARGET_SELECTIONS = [ + K8S_OPTION, + { + value: 'managed_container_runtime', + text: s__('DeploymentTarget|Managed container runtime (Fargate, Cloud Run, DigitalOcean App)'), + }, + { + value: 'self_managed_container_runtime', + text: s__( + 'DeploymentTarget|Self-managed container runtime (Podman, Docker Swarm, Docker Compose)', + ), + }, + { + value: 'heroku', + text: s__('DeploymentTarget|Heroku'), + }, + { + value: 'virtual_machine', + text: s__('DeploymentTarget|Virtual machine (for example, EC2)'), + }, + { + value: 'mobile_app_store', + text: s__('DeploymentTarget|Mobile app store'), + }, + { + value: 'registry', + text: s__('DeploymentTarget|Registry (package or container)'), + }, + { + value: 'infrastructure_provider', + text: s__('DeploymentTarget|Infrastructure provider (Terraform, Cloudformation, and so on)'), + }, + { + value: 'serverless_backend', + text: s__('DeploymentTarget|Serverless backend (Lambda, Cloud functions)'), + }, + { + value: 'edge_computing', + text: s__('DeploymentTarget|Edge Computing (e.g. Cloudflare Workers)'), + }, + { + value: 'web_deployment_platform', + text: s__('DeploymentTarget|Web Deployment Platform (Netlify, Vercel, Gatsby)'), + }, + { + value: 'gitlab_pages', + text: s__('DeploymentTarget|GitLab Pages'), + }, + { + value: 'other_hosting_service', + text: s__('DeploymentTarget|Other hosting service'), + }, + { + value: 'no_deployment', + text: s__('DeploymentTarget|No deployment planned'), + }, +]; diff --git a/app/assets/javascripts/vue_shared/components/registry/registry_search.vue b/app/assets/javascripts/vue_shared/components/registry/registry_search.vue index ab28daaa114..d6719f12017 100644 --- a/app/assets/javascripts/vue_shared/components/registry/registry_search.vue +++ b/app/assets/javascripts/vue_shared/components/registry/registry_search.vue @@ -126,7 +126,9 @@ export default {