From 9684bd1f0a9136cf24cc4a4079fe955fac1442f1 Mon Sep 17 00:00:00 2001
From: Matthew McClaskey <matt@kasmweb.com>
Date: Thu, 2 Feb 2023 16:53:50 +0000
Subject: [PATCH 1/5] KASM-3986 test fixed runner

---
 .gitlab-ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f99342..7e09375 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,6 +35,10 @@ stages:
   - cp -r builder/build/* output/
   - rm output/*.tar.gz
 
+default:
+  tags:
+    - oci-fixed-amd64
+
 build_www:
   stage: www
   allow_failure: false

From ed4d4ea59f3f15d8def1835f6f04d434317e64a5 Mon Sep 17 00:00:00 2001
From: Matthew McClaskey <matt@kasmweb.com>
Date: Thu, 9 Feb 2023 00:11:27 +0000
Subject: [PATCH 2/5] update docker host

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e09375..14fa726 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ variables:
   # arm builds, because build_debian_buster_arm matches build_debian_buster.
   # "BUILD_JOBS: none" won't build any build jobs, nor www.
   BUILD_JOBS: all
+  DOCKER_HOST: unix://
 
 workflow:
   rules:

From 73016d8d55502d108b286d35032acbe4b690feed Mon Sep 17 00:00:00 2001
From: Matthew McClaskey <matt@kasmweb.com>
Date: Thu, 9 Feb 2023 00:25:35 +0000
Subject: [PATCH 3/5] tseting

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 14fa726..3720fcc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,9 @@ build_www:
     - docker run --rm -v $PWD/builder/www:/build kasmweb/www:latest
     - mkdir -p output/www
     - cd builder
+    - echo $PWD
+    - ls -l
+    - ls -l ../output
     - tar -zcvf ../output/www/kasm_www.tar.gz www
   only:
     variables:

From b91d06f734938f1f822ad6f60333eae5067555c2 Mon Sep 17 00:00:00 2001
From: Matthew McClaskey <matt@kasmweb.com>
Date: Thu, 9 Feb 2023 02:11:25 +0000
Subject: [PATCH 4/5] arm runner

---
 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3720fcc..fcb5564 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -84,7 +84,7 @@ build_ubuntu_bionic_arm:
   stage: build
   allow_failure: false
   tags:
-    - arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -137,7 +137,7 @@ build_ubuntu_focal_arm:
   stage: build
   allow_failure: true
   tags:
-    - arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -173,7 +173,7 @@ build_ubuntu_jammy_arm:
   stage: build
   allow_failure: true
   tags:
-    - arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -209,7 +209,7 @@ build_debian_buster_arm:
   stage: build
   allow_failure: true
   tags:
-    - arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -245,7 +245,7 @@ build_debian_bullseye_arm:
   stage: build
   allow_failure: true
   tags:
-    - arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -281,7 +281,7 @@ build_kali_rolling_arm:
   stage: build
   allow_failure: true
   tags:
-    - arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -334,7 +334,7 @@ build_oracle_8_arm:
   stage: build
   allow_failure: true
   tags:
-    - arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www
@@ -370,7 +370,7 @@ build_opensuse_15_arm:
   stage: build
   allow_failure: true
   tags:
-    - arm
+    - oci-fixed-arm64
   before_script:
     - *prepare_build
     - *prepare_www

From 7366bbc613e0aea488de3f67dacec96ca43cb300 Mon Sep 17 00:00:00 2001
From: Matthew McClaskey <matt@kasmweb.com>
Date: Mon, 13 Feb 2023 18:39:26 +0000
Subject: [PATCH 5/5] build all jobs by default

---
 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcb5564..b7fb76b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -200,7 +200,7 @@ build_debian_buster:
     - bash builder/build-package debian buster;
   only:
     variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/ || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
   artifacts:
     paths:
       - output/
@@ -219,7 +219,7 @@ build_debian_buster_arm:
     - bash builder/build-package debian buster;
   only:
     variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/ || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
   artifacts:
     paths:
       - output/
@@ -236,7 +236,7 @@ build_debian_bullseye:
     - bash builder/build-package debian bullseye;
   only:
     variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/ || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
   artifacts:
     paths:
       - output/
@@ -255,7 +255,7 @@ build_debian_bullseye_arm:
     - bash builder/build-package debian bullseye;
   only:
     variables:
-      - $CI_COMMIT_MESSAGE =~ /\[full [cC][Ii]\]/ || $BUILD_JOBS =~ $CI_JOB_NAME
+      - $BUILD_JOBS == 'all' || $BUILD_JOBS =~ $CI_JOB_NAME
   artifacts:
     paths:
       - output/