From 0c4aa918bb632af45576448f737849f66ebf359e Mon Sep 17 00:00:00 2001
From: Jan Grewe <jan@faked.org>
Date: Sun, 26 May 2024 19:42:57 +0200
Subject: [PATCH] fix missing packages
---
.gitlab-ci.yml | 44 ++++++++++++++++----------------------------
1 file changed, 16 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 69e0cd7..bfe846a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,23 +3,23 @@ stages:
variables:
OPENWRT_VERSION: 23.05.3
- FILES: ${CI_PROJECT_PATH}/files
- PACKAGES: openwisp-config openwisp-monitoring netjson-monitoring
+ FILES: ${CI_PROJECT_DIR}/files
+ DEFAULT_PACKAGES: luci
+ EXTRA_PACKAGES: openwisp-config openwisp-monitoring netjson-monitoring
+ DISABLED_SERVICES: dnsmasq firewall odhcpd
+ EXTRA_IMAGE_NAME: fakedOrg
-cudy_wr3000-v1:
+.build_image:
stage: build
image: openwrt/imagebuilder:${TARGET}-${SUBTARGET}-${OPENWRT_VERSION}
- variables:
- TARGET: mediatek
- SUBTARGET: filogic
- PROFILE: cudy_wr3000-v1
before_script:
- if [[ -d ./packages ]]; then mv ./packages /builder/; fi
- if [[ -d ./dl ]]; then mv ./dl /builder/; fi
- for url in $(cat packages.txt); do curl --create-dirs -s -O --output-dir /builder/packages $url; done && ls -1 /builder/packages
- cd /builder
script:
- - make image PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${PACKAGES}"
+ - echo PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${DEFAULT_PACKAGES} ${EXTRA_PACKAGES}"
+ - make image PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${DEFAULT_PACKAGES} ${EXTRA_PACKAGES}"
after_script:
- if [[ -d /builder/bin ]]; then mv /builder/bin .; fi
- if [[ -d /builder/dl ]]; then mv /builder/dl .; fi
@@ -32,28 +32,16 @@ cudy_wr3000-v1:
- bin/
expire_in: 1 hour
+cudy_wr3000-v1:
+ extends: .build_image
+ variables:
+ TARGET: mediatek
+ SUBTARGET: filogic
+ PROFILE: cudy_wr3000-v1
+
cudy_re3000-v1:
- stage: build
- image: openwrt/imagebuilder:${TARGET}-${SUBTARGET}-${OPENWRT_VERSION}
+ extends: .build_image
variables:
TARGET: mediatek
SUBTARGET: filogic
PROFILE: cudy_re3000-v1
- before_script:
- - if [[ -d ./packages ]]; then mv ./packages /builder/; fi
- - if [[ -d ./dl ]]; then mv ./dl /builder/; fi
- - for url in $(cat packages.txt); do curl --create-dirs -s -O --output-dir /builder/packages $url; done && ls -1 /builder/packages
- - cd /builder
- script:
- - make image PROFILE=${PROFILE} FILES=${FILES} PACKAGES="${PACKAGES}"
- after_script:
- - if [[ -d /builder/bin ]]; then mv /builder/bin .; fi
- - if [[ -d /builder/dl ]]; then mv /builder/dl .; fi
- cache:
- key: ${OPENWRT_VERSION}-${TARGET}
- paths:
- - dl/
- artifacts:
- paths:
- - bin/
- expire_in: 1 hour
--
GitLab