From fed185f7fee0f62d1c0edd2566c166d9ddb3a729 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Fri, 7 Jun 2024 19:22:35 +0000 Subject: [PATCH 1/3] KASM-5149 oci runners --- .gitlab-ci.yml | 124 +++++++++++++++++++++++++------------------------ 1 file changed, 63 insertions(+), 61 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f9ca7d..c8f9e80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ -image: docker +image: docker:24.0.6 services: - - docker:dind + - docker:dind:24.0.6-dind stages: - readme @@ -10,6 +10,8 @@ stages: - linktests variables: + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" DOCKER_AUTH_CONFIG: ${_DOCKER_AUTH_CONFIG} KASM_RELEASE: "1.13.0" @@ -37,7 +39,7 @@ build_ubuntu_bionic: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_ubuntu_focal: stage: build @@ -57,7 +59,7 @@ build_ubuntu_focal: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_ubuntu_jammy: stage: build @@ -77,7 +79,7 @@ build_ubuntu_jammy: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_debian_bullseye: stage: build @@ -97,7 +99,7 @@ build_debian_bullseye: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_cuda_focal: stage: build @@ -127,7 +129,7 @@ build_remnux_focal: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_kali_rolling: @@ -148,7 +150,7 @@ build_kali_rolling: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_centos: stage: build @@ -178,7 +180,7 @@ build_oracle_7: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_oracle_8: stage: build @@ -198,7 +200,7 @@ build_oracle_8: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_oracle_9: stage: build @@ -218,7 +220,7 @@ build_oracle_9: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_rocky_9: stage: build @@ -238,7 +240,7 @@ build_rocky_9: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_rocky_8: stage: build @@ -258,7 +260,7 @@ build_rocky_8: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_alma_8: stage: build @@ -278,7 +280,7 @@ build_alma_8: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_alma_9: stage: build @@ -298,7 +300,7 @@ build_alma_9: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_opensuse_15: stage: build @@ -318,7 +320,7 @@ build_opensuse_15: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_fedora_37: stage: build @@ -341,7 +343,7 @@ build_fedora_37: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] manifest_fedora_37: stage: manifest @@ -360,7 +362,7 @@ manifest_fedora_37: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_parrotos_5: stage: build @@ -380,7 +382,7 @@ build_parrotos_5: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_alpine_317: stage: build @@ -400,7 +402,7 @@ build_alpine_317: except: - schedules tags: - - aws-autoscale + - oci-fixed-amd # These jobs should run on the feature/bugfix branches - anything that is not the develop or release branches. It should only push images to the private repos build_ubuntu_bionic_dev: @@ -422,7 +424,7 @@ build_ubuntu_bionic_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_ubuntu_focal_dev: stage: build @@ -443,7 +445,7 @@ build_ubuntu_focal_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_ubuntu_jammy_dev: stage: build @@ -464,7 +466,7 @@ build_ubuntu_jammy_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_debian_bullseye_dev: stage: build @@ -486,7 +488,7 @@ build_debian_bullseye_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_cuda_focal_dev: stage: build @@ -504,7 +506,7 @@ build_cuda_focal_dev: - develop - /^release\/.*$/ tags: - - aws-autoscale + - oci-fixed-amd build_remnux_focal_dev: stage: build @@ -523,7 +525,7 @@ build_remnux_focal_dev: - develop - /^release\/.*$/ tags: - - aws-autoscale + - oci-fixed-amd build_kali_rolling_dev: stage: build @@ -547,7 +549,7 @@ build_kali_rolling_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_centos_dev: stage: build @@ -568,7 +570,7 @@ build_centos_dev: - develop - /^release\/.*$/ tags: - - aws-autoscale + - oci-fixed-amd build_oracle_7_dev: stage: build @@ -589,7 +591,7 @@ build_oracle_7_dev: - develop - /^release\/.*$/ tags: - - aws-autoscale + - oci-fixed-amd build_oracle_8_dev: stage: build @@ -610,7 +612,7 @@ build_oracle_8_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_oracle_9_dev: stage: build @@ -631,7 +633,7 @@ build_oracle_9_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_rockylinux_9_dev: stage: build @@ -653,7 +655,7 @@ build_rockylinux_9_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_rockylinux_8_dev: stage: build @@ -675,7 +677,7 @@ build_rockylinux_8_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_almalinux_9_dev: stage: build @@ -697,7 +699,7 @@ build_almalinux_9_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_almalinux_8_dev: stage: build @@ -719,7 +721,7 @@ build_almalinux_8_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_opensuse_15_dev: stage: build @@ -740,7 +742,7 @@ build_opensuse_15_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_fedora_37_dev: stage: build @@ -761,7 +763,7 @@ build_fedora_37_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_parrotos_5_dev: stage: build @@ -783,7 +785,7 @@ build_parrotos_5_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] build_alpine_317_dev: stage: build @@ -805,7 +807,7 @@ build_alpine_317_dev: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] test_multi_arch_dev: stage: test @@ -836,7 +838,7 @@ test_multi_arch_dev: - manifest_dev parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] KASM_IMAGE: - core-ubuntu-bionic-private - core-ubuntu-focal-private @@ -878,7 +880,7 @@ test_single_arch_dev: - develop - /^release\/.*$/ tags: - - aws-autoscale + - oci-fixed-amd needs: - build_cuda_focal_dev - build_centos_dev @@ -905,7 +907,7 @@ manifest_dev: - develop - /^release\/.*$/ tags: - - aws-autoscale + - oci-fixed-amd needs: - build_ubuntu_bionic_dev - build_ubuntu_focal_dev @@ -1007,7 +1009,7 @@ build_ubuntu_bionic_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_ubuntu_focal_scheduled: stage: build @@ -1024,7 +1026,7 @@ build_ubuntu_focal_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_ubuntu_jammy_scheduled: stage: build @@ -1041,7 +1043,7 @@ build_ubuntu_jammy_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_debian_bullseye_scheduled: stage: build @@ -1058,7 +1060,7 @@ build_debian_bullseye_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_cuda_focal_schedules: stage: build @@ -1076,7 +1078,7 @@ build_remnux_focal_schedules: - docker push ${ORG_NAME}/core-remnux-focal-private:$SANITIZED_ROLLING_BRANCH - docker push ${ORG_NAME}/core-remnux-focal:$SANITIZED_ROLLING_BRANCH tags: - - aws-autoscale + - oci-fixed-amd only: - schedules @@ -1095,7 +1097,7 @@ build_kali_rolling_schedules: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_centos_schedules: stage: build @@ -1115,7 +1117,7 @@ build_oracle_7_schedules: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_oracle_8_scheduled: stage: build @@ -1132,7 +1134,7 @@ build_oracle_8_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_oracle_9_scheduled: stage: build @@ -1149,7 +1151,7 @@ build_oracle_9_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_rockylinux_9_scheduled: stage: build @@ -1166,7 +1168,7 @@ build_rockylinux_9_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_rockylinux_8_scheduled: stage: build @@ -1183,7 +1185,7 @@ build_rockylinux_8_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_almalinux_9_scheduled: stage: build @@ -1200,7 +1202,7 @@ build_almalinux_9_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_almalinux_8_scheduled: stage: build @@ -1217,7 +1219,7 @@ build_almalinux_8_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_opensuse_15_scheduled: stage: build @@ -1234,7 +1236,7 @@ build_opensuse_15_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_fedora_37_scheduled: stage: build @@ -1254,7 +1256,7 @@ build_fedora_37_scheduled: - ${TAG} parallel: matrix: - - TAG: [ aws-autoscale, aws-autoscale-arm64 ] + - TAG: [ oci-fixed-amd, oci-fixed-amd ] manifest_fedora_37_scheduled: stage: manifest @@ -1270,7 +1272,7 @@ manifest_fedora_37_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_parrotos_5_scheduled: stage: build @@ -1287,7 +1289,7 @@ build_parrotos_5_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd build_parrotos_5_scheduled: stage: build @@ -1304,7 +1306,7 @@ build_parrotos_5_scheduled: only: - schedules tags: - - aws-autoscale + - oci-fixed-amd update_readmes: stage: readme @@ -1321,7 +1323,7 @@ update_readmes: - $README_USERNAME - $README_PASSWORD tags: - - aws-autoscale + - oci-fixed-amd parallel: matrix: - KASM_IMAGE: From a5d251be18d0784a21b458a797cf2cd449a0e3f6 Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Fri, 7 Jun 2024 19:30:27 +0000 Subject: [PATCH 2/3] fix arm tags --- .gitlab-ci.yml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8f9e80..9526607 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -343,7 +343,7 @@ build_fedora_37: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] manifest_fedora_37: stage: manifest @@ -424,7 +424,7 @@ build_ubuntu_bionic_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_ubuntu_focal_dev: stage: build @@ -445,7 +445,7 @@ build_ubuntu_focal_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_ubuntu_jammy_dev: stage: build @@ -466,7 +466,7 @@ build_ubuntu_jammy_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_debian_bullseye_dev: stage: build @@ -488,7 +488,7 @@ build_debian_bullseye_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_cuda_focal_dev: stage: build @@ -549,7 +549,7 @@ build_kali_rolling_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_centos_dev: stage: build @@ -612,7 +612,7 @@ build_oracle_8_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_oracle_9_dev: stage: build @@ -633,7 +633,7 @@ build_oracle_9_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_rockylinux_9_dev: stage: build @@ -655,7 +655,7 @@ build_rockylinux_9_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_rockylinux_8_dev: stage: build @@ -677,7 +677,7 @@ build_rockylinux_8_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_almalinux_9_dev: stage: build @@ -699,7 +699,7 @@ build_almalinux_9_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_almalinux_8_dev: stage: build @@ -721,7 +721,7 @@ build_almalinux_8_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_opensuse_15_dev: stage: build @@ -742,7 +742,7 @@ build_opensuse_15_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_fedora_37_dev: stage: build @@ -763,7 +763,7 @@ build_fedora_37_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_parrotos_5_dev: stage: build @@ -785,7 +785,7 @@ build_parrotos_5_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] build_alpine_317_dev: stage: build @@ -807,7 +807,7 @@ build_alpine_317_dev: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] test_multi_arch_dev: stage: test @@ -838,7 +838,7 @@ test_multi_arch_dev: - manifest_dev parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] KASM_IMAGE: - core-ubuntu-bionic-private - core-ubuntu-focal-private @@ -1256,7 +1256,7 @@ build_fedora_37_scheduled: - ${TAG} parallel: matrix: - - TAG: [ oci-fixed-amd, oci-fixed-amd ] + - TAG: [ oci-fixed-amd, oci-fixed-arm ] manifest_fedora_37_scheduled: stage: manifest From ea885efad5a560d1f34ab8249c01a77a45d736ba Mon Sep 17 00:00:00 2001 From: Matthew McClaskey Date: Fri, 7 Jun 2024 19:32:27 +0000 Subject: [PATCH 3/3] fix service name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9526607..e6a679e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ image: docker:24.0.6 services: - - docker:dind:24.0.6-dind + - docker:24.0.6-dind stages: - readme