Verified Commit 8129df89 authored by Michael Usachenko's avatar Michael Usachenko Committed by GitLab
Browse files

feat(e2e): expose ui from e2e harness via serve xtask

parent e0c8ff0d

Cargo.lock

+1 −0
Original line number Diff line number Diff line
@@ -8235,6 +8235,7 @@ name = "xtask" 
version = "0.1.0"

dependencies = [

 "anyhow",

 "base64 0.22.1",

 "bollard",

 "clap",

 "cliclack",

config/e2e.yaml

+14 −4
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
# -- Colima / k8s --------------------------------------------------------------

colima:

  profile: cng

  memory: "12"              # GB

  memory: "16"              # GB

  cpus: "4"

  disk: "60"                # GB

  disk: "100"               # GB

  vm_type: vz                 # vz (macOS Virtualization.framework) or qemu

  k8s_version: v1.31.5+k3s1
@@ -22,7 +22,7 @@ namespaces: 


# -- CNG image settings -------------------------------------------------------

cng:

  base_tag: v18.8.1

  base_tag: v18.9.0

  registry: registry.gitlab.com/gitlab-org/build/cng

  local_prefix: gkg-e2e

  local_tag: local
@@ -45,7 +45,7 @@ helm: 
  gitlab:

    release: gitlab

    chart: gitlab/gitlab

    chart_version: "9.8.1"    # must match cng.base_tag (v18.8.1 → chart 9.8.1)

    chart_version: "9.9.0"    # must match cng.base_tag (v18.9.0 → chart 9.9.0)

    repo_name: gitlab

    repo_url: https://charts.gitlab.io

    timeout: 15m
@@ -112,6 +112,16 @@ gkg: 
  server_credentials_jwt_key: jwt-secret

  indexer_label: app.kubernetes.io/component=gkg-indexer



# -- Port-forwards (cargo xtask e2e serve) -------------------------------------

gitlab_ui:

  service: gitlab-webservice-default

  service_port: "8181"              # workhorse port (serves static assets)

  local_port: "8929"

  gkg_service: gkg-webserver

  gkg_service_port: "8080"

  gkg_local_port: "8930"

  root_password: "G1tL4b_e2e_t3st!"    # must pass GitLab password complexity rules



# -- Label selectors -----------------------------------------------------------

labels:

  toolbox: app=toolbox

crates/xtask/Cargo.toml

+1 −0
Original line number Diff line number Diff line
@@ -27,3 +27,4 @@ tar = { workspace = true } 
tokio = { workspace = true }

tokio-util = { workspace = true }

serde_json = { workspace = true }

base64 = { workspace = true }

crates/xtask/src/e2e/config.rs

+12 −0
Original line number Diff line number Diff line
@@ -136,6 +136,17 @@ pub struct PodReadiness { 
    pub timeout: String,

}



#[derive(Debug, Deserialize)]

pub struct GitlabUi {

    pub service: String,

    pub service_port: String,

    pub local_port: String,

    pub gkg_service: String,

    pub gkg_service_port: String,

    pub gkg_local_port: String,

    pub root_password: String,

}



#[derive(Debug, Deserialize)]

pub struct Timeouts {

    pub ch_pod: String,
@@ -166,6 +177,7 @@ pub struct Config { 
    pub clickhouse: ClickHouse,

    pub siphon: Siphon,

    pub gkg: Gkg,

    pub gitlab_ui: GitlabUi,

    pub labels: Labels,

    pub pod_readiness: Vec<PodReadiness>,

    pub gkg_pod_readiness: Vec<PodReadiness>,

crates/xtask/src/e2e/constants.rs

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ pub const MANIFEST_JSON: &str = "manifest.json"; 
pub const TRAEFIK_VALUES_YAML: &str = "traefik-values.yaml";

pub const GITLAB_VALUES_YAML: &str = "gitlab-values.yaml";

pub const DOCKERFILE_RAILS: &str = "Dockerfile.rails";

pub const DOCKERFILE_WORKHORSE: &str = "Dockerfile.workhorse";

pub const COLIMA_START_LOG: &str = "colima-start.log";

pub const CH_MIGRATE_LOG: &str = "clickhouse-migrate.log";

pub const REDACTION_TEST_RB: &str = "redaction_test.rb";