dr

Signed-off-by: acejilam <[email protected]>

Author: ls-2018

packages/linux-kernel/Jenkinsfile

@@ -72,4 +72,4 @@ def pkgList = [
 ]
 
 // Start package build using library function from https://github.com/vyos/vyos-build
-buildPackage('Kernel', pkgList, null, true, "(.*packages/linux-kernel/.+|.*data/defaults.+)", "ec2_amd64", "REGEXP")
+buildPackage('Kernel', pkgList, null, true, "(.*packages/linux-kernel/.+|.*data/defaults.+)", "ec2_arm64", "REGEXP")

packages/telegraf/build.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 CWD=$(pwd)
-set -e
-
+set -ex
+export GOPROXY=https://goproxy.cn/,direct
 BUILD_ARCH=$(dpkg-architecture -qDEB_TARGET_ARCH)
 
 SRC=telegraf

packages/vyos-build-container/Jenkinsfile

@@ -30,7 +30,7 @@ pipeline {
 	stages {
 		stage('Build') {
 			agent {
-				label "ec2_amd64"
+				label "ec2_arm64"
 			}
 			when {
 				anyOf {

packages/vyos-build-container/build.sh

@@ -3,20 +3,23 @@ set -e
 
 cd vyos-build/docker
 
-echo "Inspecting current image of ${BRANCH_NAME}..."
-previousImageId=$(docker images --filter=reference="vyos/vyos-build:${BRANCH_NAME}" --format "{{.ID}}")
+#echo "Inspecting current image of ${BRANCH_NAME}..."
+#previousImageId=$(docker images --filter=reference="vyos/vyos-build:${BRANCH_NAME}" --format "{{.ID}}")
+#
+#echo "Building docker build container for branch ${BRANCH_NAME}..."
+#docker build --no-cache -t "vyos/vyos-build:${BRANCH_NAME}" --build-arg ARCH=arm64v8/  .
+#
+docker pull registry.cn-hangzhou.aliyuncs.com/ls-2018/vyos-build:sagitta-arm64-dd010101
 
-echo "Building docker build container for branch ${BRANCH_NAME}..."
-docker build --no-cache -t "vyos/vyos-build:${BRANCH_NAME}" .
-
-echo "Pushing ${BRANCH_NAME} image to registry ${CUSTOM_DOCKER_REPO}..."
-docker tag "vyos/vyos-build:${BRANCH_NAME}" "${CUSTOM_DOCKER_REPO}/vyos/vyos-build:${BRANCH_NAME}"
+#echo "Pushing ${BRANCH_NAME} image to registry ${CUSTOM_DOCKER_REPO}..."
+docker tag registry.cn-hangzhou.aliyuncs.com/ls-2018/vyos-build:sagitta-arm64-dd010101 "${CUSTOM_DOCKER_REPO}/vyos/vyos-build:${BRANCH_NAME}"
 docker push "${CUSTOM_DOCKER_REPO}/vyos/vyos-build:$BRANCH_NAME"
-
-echo "Cleaning previous image of ${BRANCH_NAME}..."
-if [ "$previousImageId" != "" ]; then
-  docker rmi --force "$previousImageId" || true
-fi
+#
+#echo "Cleaning previous image of ${BRANCH_NAME}..."
+#if [ "$previousImageId" != "" ]; then
+#  docker rmi --force "$previousImageId" || true
+#fi
+docker rmi registry.cn-hangzhou.aliyuncs.com/ls-2018/vyos-build:sagitta-arm64-dd010101
 
 echo "Cleaning local registry..."
 docker exec registry registry garbage-collect /etc/docker/registry/config.yml --delete-untagged=true