pull in CI changes so it builds

This commit is contained in:
Matt McClaskey 2025-12-01 12:16:52 -05:00
parent 39bd5b98af
commit 0b0817ea80
No known key found for this signature in database
2 changed files with 12 additions and 10 deletions

View file

@ -146,7 +146,7 @@ function upload_to_s3() {
function prepare_to_run_scripts_and_s3_uploads() {
export DEBIAN_FRONTEND=noninteractive
apt-get update
apt-get install -y ruby3.1 wget curl file awscli
apt-get install -y ruby wget curl file awscli git
}
detect_release_branch() {

View file

@ -18,6 +18,7 @@ variables:
# To debug upload stage, you can limit BUILD_DISTROS_REGEX to jammy and allow
# run_test distros to fail, by setting ALLOW_RUN_TESTS_TO_FAIL to true.
ALLOW_RUN_TESTS_TO_FAIL: false
DEBIAN_STABLE_IMAGE: debian:trixie-slim
DOCKER_HOST: tcp://docker:2375
DOCKER_TLS_CERTDIR: ""
@ -38,7 +39,7 @@ stages:
- pwd
- mkdir -p "$GITLAB_SHARED_DIND_DIR" && chmod 777 "$GITLAB_SHARED_DIND_DIR"
- apt-get update && apt-get install -y docker.io
- docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD
- echo "$DOCKER_HUB_PASSWORD" | docker login --username $DOCKER_HUB_USERNAME --password-stdin
.prepare_www: &prepare_www
- tar -zxf output/www/kasm_www.tar.gz -C builder/
@ -51,12 +52,13 @@ stages:
- echo core > /proc/sys/kernel/core_pattern
default:
retry: 2
tags:
- oci-fixed-amd
functional_test:
stage: functional_test
image: debian:bookworm-slim
image: $DEBIAN_STABLE_IMAGE
tags:
- oci-fixed-amd
before_script:
@ -104,7 +106,7 @@ build_www:
build_amd64:
stage: build
allow_failure: true
image: debian:bookworm-slim
image: $DEBIAN_STABLE_IMAGE
tags:
- oci-fixed-amd
before_script:
@ -126,7 +128,7 @@ build_amd64:
build_arm64:
stage: build
allow_failure: true
image: debian:bookworm-slim
image: $DEBIAN_STABLE_IMAGE
tags:
- oci-fixed-arm
before_script:
@ -147,7 +149,7 @@ build_arm64:
run_test_amd64:
stage: run_test
image: debian:bookworm-slim
image: $DEBIAN_STABLE_IMAGE
tags:
- oci-fixed-amd
before_script:
@ -176,7 +178,7 @@ run_test_amd64:
run_test_arm64:
stage: run_test
image: debian:bookworm-slim
image: $DEBIAN_STABLE_IMAGE
tags:
- oci-fixed-arm
before_script:
@ -206,7 +208,7 @@ run_test_arm64:
spec_test:
stage: test
image: debian:bookworm-slim
image: $DEBIAN_STABLE_IMAGE
tags:
- kasmvnc-x86
before_script:
@ -222,7 +224,7 @@ spec_test:
upload:
stage: upload
image: debian:bookworm-slim
image: $DEBIAN_STABLE_IMAGE
tags:
- oci-fixed-amd
artifacts:
@ -261,7 +263,7 @@ upload_build_preview:
stage: upload
needs: ["upload"]
dependencies: ["upload"]
image: debian:bookworm-slim
image: $DEBIAN_STABLE_IMAGE
tags:
- oci-fixed-amd
before_script: