From 24a6f9b4e55d32366e1bf962ae88eedd5389e4d9 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 08:42:17 +0100 Subject: [PATCH 01/22] MISP-1958 Removed incorrect submodule 'fix' --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cff19bc2..2cda6fe5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,8 +10,11 @@ include: .retrieve_source: before_script: + - echo "Initializing submodules\n" + # HACK hardcoded path creation: + - mkdir -p "/builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce" - git -c submodule.linux.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/linux" submodule update --init --recursive - - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive + #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive # Build stage # =========== From a04632f64df31acf46d27af2d8a5578a1a9c8398 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 09:02:53 +0100 Subject: [PATCH 02/22] MISP-1958 Test 001 --- .gitlab-ci.yml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cda6fe5..01bfffc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,9 +13,35 @@ include: - echo "Initializing submodules\n" # HACK hardcoded path creation: - mkdir -p "/builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce" - - git -c submodule.linux.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/linux" submodule update --init --recursive + #- git -c submodule.linux.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/linux" submodule update --init --recursive #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive +# Overriding prime-jedi 'prepare_environment'. +# Prevents execution of source retrieval steps which cannot handle submodules not in GitLab +# The 'script' body is an exact match of prime-jedi's jedi-gitlab-ci-template.yml step. +prepare_environment: + image: "registry.hub.docker.com/library/docker:stable-git" + extends: + - .jobs_common + - .retrieve_source + stage: prepare + script: + - | + if [ -f ./docker_env/make_docker.sh ]; then + ./docker_env/make_docker.sh "${BUILD_PIPELINE_IMAGE}" + else + docker build --rm -t "${BUILD_PIPELINE_IMAGE}" ./docker_env/ + + if ! docker run --rm --privileged -e "ARM_EMU_BIN=${ARM_EMU_BIN}" -v "${ARM_EMU_BIN}:${ARM_EMU_BIN}:ro" "${BUILD_PIPELINE_IMAGE}" "./buildenv_check.sh"; then + echo "Something is wrong with the build environment, please check your Dockerfile." + exit 1 + fi + fi + + docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + docker push "${BUILD_PIPELINE_IMAGE}" + + # Build stage # =========== build: From af4c56058f3bbcc17c799191ea3d92d080c9c25a Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 09:21:42 +0100 Subject: [PATCH 03/22] MISP-1958 Test 002 --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01bfffc4..5a9f5a79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,12 +8,17 @@ include: ref: master file: /gitlab_ci_templates/jedi-gitlab-ci-template.yml +default: + # Only the prepare/cleanup_enviroment steps don't use the image containing the Docker + image: "${BUILD_PIPELINE_IMAGE}" + .retrieve_source: before_script: - echo "Initializing submodules\n" # HACK hardcoded path creation: - mkdir -p "/builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce" - #- git -c submodule.linux.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/linux" submodule update --init --recursive + - git submodule update --init --recursive + ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive # Overriding prime-jedi 'prepare_environment'. From 942497041ce0c7fc570a30f6324fa32f07416c4a Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 10:16:35 +0100 Subject: [PATCH 04/22] MISP-1958 Test 003 --- .gitlab-ci.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a9f5a79..b5d900a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ default: # HACK hardcoded path creation: - mkdir -p "/builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce" - git submodule update --init --recursive - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive # Overriding prime-jedi 'prepare_environment'. @@ -46,6 +46,20 @@ prepare_environment: docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY docker push "${BUILD_PIPELINE_IMAGE}" +# Overriding prime-jedi 'prepare_environment'. +# Prevents execution of source retrieval steps which cannot handle submodules not in GitLab +# The 'script' body is an exact match of prime-jedi's jedi-gitlab-ci-template.yml step. +cleanup_environment: + image: "registry.hub.docker.com/library/docker:stable-git" + extends: + - .jobs_common + stage: cleanup + when: always + script: + - | + if ! docker inspect --type image "${BUILD_PIPELINE_IMAGE}" 1> /dev/null; then + docker rmi -f "${BUILD_PIPELINE_IMAGE}" + fi # Build stage # =========== From 3767c09bb5e6cbf20471453075b1cff65d0a9ed7 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 10:37:30 +0100 Subject: [PATCH 05/22] MISP-1958 Test 004 --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5d900a0..11e14cf1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,9 +14,10 @@ default: .retrieve_source: before_script: - - echo "Initializing submodules\n" + - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 + - echo "Initializing submodules" # HACK hardcoded path creation: - - mkdir -p "/builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce" + #- mkdir -p "/builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce" - git submodule update --init --recursive - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive From fb9d22bcebdb3e5920815670df50089feab3e87f Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 10:53:12 +0100 Subject: [PATCH 06/22] MISP-1958 Test 005 --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11e14cf1..0a448c0b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,10 +16,11 @@ default: before_script: - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - echo "Initializing submodules" + - ls /builds/ultimaker/embedded/platform/um-kernel/linux # HACK hardcoded path creation: #- mkdir -p "/builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce" - git submodule update --init --recursive - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive # Overriding prime-jedi 'prepare_environment'. From bb8e28d321cb318efa7274f17b478569ccc058a6 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 11:20:27 +0100 Subject: [PATCH 07/22] MISP-1958 Test 006 --- .gitlab-ci.yml | 5 +++++ .gitmodules | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a448c0b..92fae3b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,11 @@ default: - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - echo "Initializing submodules" - ls /builds/ultimaker/embedded/platform/um-kernel/linux + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce # HACK hardcoded path creation: #- mkdir -p "/builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce" - git submodule update --init --recursive diff --git a/.gitmodules b/.gitmodules index 1b9a11a9..a449ac61 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "linux"] path = linux - url = https://github.com/Ultimaker/linux.git + url = https://github.com/Ultimaker/linux.git + branch = master-som_imx6 From af2c771c0065919aaa96c0f9a32d398c23c4d46e Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 11:24:33 +0100 Subject: [PATCH 08/22] MISP-1958 Test 007 --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 92fae3b9..9984f03b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ default: .retrieve_source: before_script: + - rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - echo "Initializing submodules" - ls /builds/ultimaker/embedded/platform/um-kernel/linux From e4fec79a53884f0bf6bc56d8fad7f8acc2f361db Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 11:29:10 +0100 Subject: [PATCH 09/22] MISP-1958 Test 008 --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9984f03b..44e87bf1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,15 +17,13 @@ default: - rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - echo "Initializing submodules" + - git submodule update --init --recursive - ls /builds/ultimaker/embedded/platform/um-kernel/linux - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce - # HACK hardcoded path creation: - #- mkdir -p "/builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce" - - git submodule update --init --recursive #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive From 84f5a6ee782ab1546ad79b78e7cd3de646ac198b Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 12:47:11 +0100 Subject: [PATCH 10/22] MISP-1958 Test 009 --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44e87bf1..8d856370 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,10 +14,11 @@ default: .retrieve_source: before_script: - - rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux + #- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - echo "Initializing submodules" - - git submodule update --init --recursive + - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive + # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive - ls /builds/ultimaker/embedded/platform/um-kernel/linux - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net From cb792742465c894693d4d9491ab17618011a7c34 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 12:59:12 +0100 Subject: [PATCH 11/22] MISP-1958 Test 0w10 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d856370..39fa4d8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,7 @@ default: #- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - echo "Initializing submodules" - - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive + - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive - ls /builds/ultimaker/embedded/platform/um-kernel/linux - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers From 41d12badbc6bd06f2698d9ce1b07b6706ff7e45e Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 13:12:41 +0100 Subject: [PATCH 12/22] MISP-1958 Test 011 --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 39fa4d8b..601af376 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,9 @@ default: .retrieve_source: before_script: #- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux - - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 + - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 + - echo "CI commit ref name: '${CI_COMMIT_REF_NAME}'" + - echo "CI PIPELINE source: '${CI_PIPELINE_SOURCE}'" - echo "Initializing submodules" - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive From 3ebe074ab9b0f78de0b2a1cb17f3a9f825d6385a Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 13:15:28 +0100 Subject: [PATCH 13/22] MISP-1958 Test 012 --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 601af376..60dd68d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,13 +20,13 @@ default: - echo "CI PIPELINE source: '${CI_PIPELINE_SOURCE}'" - echo "Initializing submodules" - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force - # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive - - ls /builds/ultimaker/embedded/platform/um-kernel/linux - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce + # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive From f6801a3f866d1aa848a94b54cc4c62bdafeefd50 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 13:25:53 +0100 Subject: [PATCH 14/22] MISP-1958 Test 013 --- .gitlab-ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60dd68d5..5bbfeec8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,8 @@ default: # Only the prepare/cleanup_enviroment steps don't use the image containing the Docker image: "${BUILD_PIPELINE_IMAGE}" +# WORKS FOR LINUX not for realtek: - git submodule update --init --recursive +#- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce .retrieve_source: before_script: #- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux @@ -20,15 +22,6 @@ default: - echo "CI PIPELINE source: '${CI_PIPELINE_SOURCE}'" - echo "Initializing submodules" - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force - # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive - #- ls /builds/ultimaker/embedded/platform/um-kernel/linux - #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers - #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net - #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless - #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek - #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce - #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce - #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive # Overriding prime-jedi 'prepare_environment'. # Prevents execution of source retrieval steps which cannot handle submodules not in GitLab From 2deb9551c2fda128a20f609eecd6bdb662dda0ac Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 13:38:01 +0100 Subject: [PATCH 15/22] MISP-1958 Test 014 --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bbfeec8..9d4bb52b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,14 +14,12 @@ default: # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce +#- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux .retrieve_source: before_script: - #- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - - echo "CI commit ref name: '${CI_COMMIT_REF_NAME}'" - - echo "CI PIPELINE source: '${CI_PIPELINE_SOURCE}'" - - echo "Initializing submodules" - - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force + - echo "CI: '${CI_COMMIT_REF_NAME}'/'${CI_PIPELINE_SOURCE}'" + - git submodule update --init --recursive # Overriding prime-jedi 'prepare_environment'. # Prevents execution of source retrieval steps which cannot handle submodules not in GitLab From 9ff75e71dbc411267860406c25d90e3103a2d5fc Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 15:12:41 +0100 Subject: [PATCH 16/22] MISP-1958 Test 016 --- .gitlab-ci.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d4bb52b..235c6352 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,14 +12,21 @@ default: # Only the prepare/cleanup_enviroment steps don't use the image containing the Docker image: "${BUILD_PIPELINE_IMAGE}" -# WORKS FOR LINUX not for realtek: - git submodule update --init --recursive -#- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce -#- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux .retrieve_source: before_script: - - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - - echo "CI: '${CI_COMMIT_REF_NAME}'/'${CI_PIPELINE_SOURCE}'" - - git submodule update --init --recursive + #- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux + - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 + - echo "Initializing submodules" + - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force + # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive + - ls /builds/ultimaker/embedded/platform/um-kernel/linux + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce + #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive # Overriding prime-jedi 'prepare_environment'. # Prevents execution of source retrieval steps which cannot handle submodules not in GitLab @@ -71,3 +78,4 @@ build: - ci/add_private_key.sh - ./build.sh - cp -v ./_build*/*.deb "./" + From fa54fa050d837adeaa42e71b1d227829e4337c1c Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 15:33:59 +0100 Subject: [PATCH 17/22] MISP-1958 Test 017 --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 235c6352..7cf120ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,15 +16,15 @@ default: before_script: #- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - - echo "Initializing submodules" + - echo "Initializing submodules ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL}" - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive - - ls /builds/ultimaker/embedded/platform/um-kernel/linux - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek - - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek + #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive From 77536db055ccf8cfb0a488d7662d213a5d57bdea Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 15:41:52 +0100 Subject: [PATCH 18/22] MISP-1958 Test 018 --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cf120ac..ee03f828 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,8 +16,9 @@ default: before_script: #- rm -rf /builds/ultimaker/embedded/platform/um-kernel/linux - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 - - echo "Initializing submodules ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL}" - - git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force + #- echo "Initializing submodules ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL}" + #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force + - git submodule update --init --recursive --force # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive #- ls /builds/ultimaker/embedded/platform/um-kernel/linux #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers From 518e661091c4d9a3b57c4d4728a5ff7bae7b14d0 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 15:47:49 +0100 Subject: [PATCH 19/22] MISP-1958 Test 0189 --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee03f828..b80029b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,9 @@ default: - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 #- echo "Initializing submodules ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL}" #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force - - git submodule update --init --recursive --force + - git submodule add -b master --reference https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce linux/drivers/net/wireless/realtek/rtl8822ce + - git submodule update --init + #- git submodule update --init --recursive --force # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive #- ls /builds/ultimaker/embedded/platform/um-kernel/linux #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers @@ -26,7 +28,7 @@ default: #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce - #- ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce + - ls /builds/ultimaker/embedded/platform/um-kernel/linux/drivers/net/wireless/realtek/rtl8822ce #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive # Overriding prime-jedi 'prepare_environment'. From dc8c1da05be3b99b3658e3dee8bea4a106271ac8 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 15:50:55 +0100 Subject: [PATCH 20/22] MISP-1958 Test 020 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b80029b5..a6e68ce8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ default: - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 #- echo "Initializing submodules ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL}" #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force - - git submodule add -b master --reference https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce linux/drivers/net/wireless/realtek/rtl8822ce + - git submodule add -b master --reference https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce ./linux/drivers/net/wireless/realtek/rtl8822ce - git submodule update --init #- git submodule update --init --recursive --force # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive From af09aea96fb27e2d74dc453f177883eeb9f74147 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Tue, 22 Mar 2022 16:12:03 +0100 Subject: [PATCH 21/22] MISP-1958 Test 0201 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6e68ce8..fc875c58 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ default: - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 #- echo "Initializing submodules ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL}" #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force - - git submodule add -b master --reference https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce ./linux/drivers/net/wireless/realtek/rtl8822ce + - git submodule add -b master https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce ./linux/drivers/net/wireless/realtek/rtl8822ce - git submodule update --init #- git submodule update --init --recursive --force # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive From 038198bfe1143c5516a9015d1e34a1070e4b6f23 Mon Sep 17 00:00:00 2001 From: ultimaker-ci Date: Wed, 23 Mar 2022 07:51:54 +0100 Subject: [PATCH 22/22] MISP-1958 Test 022 --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc875c58..bd703d1a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,8 +18,9 @@ default: - git clone --branch ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL} --depth=1 #- echo "Initializing submodules ${CI_COMMIT_REF_NAME} ${CI_REPOSITORY_URL}" #- git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init --recursive --force - - git submodule add -b master https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce ./linux/drivers/net/wireless/realtek/rtl8822ce - - git submodule update --init + - git submodule foreach --recursive git -c submodule.drivers.net.wireless.realtek.rtl8822ce.url="https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce" submodule update --init + #- git submodule add -b master https://ultimaker-ci:${CI_PERSONAL_ACCESS_TOKEN}@github.com/Ultimaker/rtl8822ce ./linux/drivers/net/wireless/realtek/rtl8822ce + #- git submodule update --init #- git submodule update --init --recursive --force # WORKS FOR LINUX not for realtek: - git submodule update --init --recursive #- ls /builds/ultimaker/embedded/platform/um-kernel/linux