Git-Mirrors/veilid
1
0
Fork 0
mirror of https://gitlab.com/veilid/veilid.git synced 2024-12-25 07:19:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes scp from build machines to orchestrator

Browse Source 
Each machine needed a script this specified that machine's arch
and OS type. Also added a rule on the cache and test jobs to not
run if the dry run trigger is present. [ci dryrun]
This commit is contained in:
TC Johnson 2024-04-29 17:07:40 -05:00
parent 37dbe70e05
commit 4d9787fb86
No known key found for this signature in database
4 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@ -40,6 +40,10 @@ build_cache:
- else - else
- echo "No need to rebuild" - echo "No need to rebuild"
- fi - fi
rules:
- if: $CI_COMMIT_MESSAGE =~ /\[ci dryrun]/
- when: never
# Runs a basic unit test build, this task will use the `build-cache:latest` as set up in the projects Container Registry # Runs a basic unit test build, this task will use the `build-cache:latest` as set up in the projects Container Registry
test_build: test_build:
@ -53,7 +57,9 @@ test_build:
- *earthly_setup - *earthly_setup
- earthly --use-inline-cache +unit-tests-linux --BASE=container $project_args - earthly --use-inline-cache +unit-tests-linux --BASE=container $project_args
resource_group: test resource_group: test
# when: manual rules:
- if: $CI_COMMIT_MESSAGE =~ /\[ci dryrun]/
- when: never
# Actual release -- triggered by pushing a new version tag # Actual release -- triggered by pushing a new version tag
@ -88,7 +94,7 @@ package_amd64_deb:
script: script:
- earthly bootstrap - earthly bootstrap
- earthly +package-linux-amd64-deb - earthly +package-linux-amd64-deb
- bash scripts/cicd/build-machine/scp-to-orchestrator.sh - bash scripts/cicd/build-machine/scp-amd64-debs-to-orchestrator.sh
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'
@ -101,7 +107,7 @@ package_arm64_deb:
script: script:
- earthly bootstrap - earthly bootstrap
- earthly +package-linux-arm64-deb - earthly +package-linux-arm64-deb
- bash scripts/cicd/build-machine/scp-to-orchestrator.sh - bash scripts/cicd/build-machine/scp-arm64-debs-to-orchestrator.sh
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'
@ -114,7 +120,7 @@ package_amd64_rpm:
script: script:
- earthly bootstrap - earthly bootstrap
- earthly +package-linux-amd64-rpm - earthly +package-linux-amd64-rpm
- bash scripts/cicd/build-machine/scp-to-orchestrator.sh - bash scripts/cicd/build-machine/scp-amd64-rmps-to-orchestrator.sh
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'
@ -202,7 +208,7 @@ dryrun_package_amd64_deb:
script: script:
- earthly bootstrap - earthly bootstrap
- earthly +package-linux-amd64-deb - earthly +package-linux-amd64-deb
- bash scripts/cicd/build-machine/scp-to-orchestrator.sh - bash scripts/cicd/build-machine/scp-amd64-debs-to-orchestrator.sh
rules: rules:
- if: $CI_COMMIT_MESSAGE =~ /\[ci dryrun]/ - if: $CI_COMMIT_MESSAGE =~ /\[ci dryrun]/
@ -215,7 +221,7 @@ dryrun_package_arm64_deb:
script: script:
- earthly bootstrap - earthly bootstrap
- earthly +package-linux-arm64-deb - earthly +package-linux-arm64-deb
- bash scripts/cicd/build-machine/scp-to-orchestrator.sh - bash scripts/cicd/build-machine/scp-arm64-debs-to-orchestrator.sh
rules: rules:
- if: $CI_COMMIT_MESSAGE =~ /\[ci dryrun]/ - if: $CI_COMMIT_MESSAGE =~ /\[ci dryrun]/
@ -228,7 +234,7 @@ dryrun_package_amd64_rpm:
script: script:
- earthly bootstrap - earthly bootstrap
- earthly +package-linux-amd64-rpm - earthly +package-linux-amd64-rpm
- bash scripts/cicd/build-machine/scp-to-orchestrator.sh - bash scripts/cicd/build-machine/scp-amd64-rmps-to-orchestrator.sh
rules: rules:
- if: $CI_COMMIT_MESSAGE =~ /\[ci dryrun]/ - if: $CI_COMMIT_MESSAGE =~ /\[ci dryrun]/

0
scripts/cicd/build-machine/scp-to-orchestrator.sh → scripts/cicd/build-machine/scp-amd64-debs-to-orchestrator.sh
View File

9
scripts/cicd/build-machine/scp-amd64-rpms-to-orchestrator.sh Normal file
View File

@ -0,0 +1,9 @@
#!/bin/bash
mkdir workspace
cd workspace
cp ~/builds/C6yRimG-M/0/veilid/veilid/target/packages/*.rpm .
tar -cf amd64-rpms.tar *.rpm
scp *.tar gitlab-runner@10.116.0.5:~
cd ~
rm -rf workspace

9
scripts/cicd/build-machine/scp-arm64-debs-to-orchestrator.sh Normal file
View File

@ -0,0 +1,9 @@
#!/bin/bash
mkdir workspace
cd workspace
cp ~/builds/7TYBLKUtG/0/veilid/veilid/target/packages/*.deb .
tar -cf arm64-debs.tar *.deb
scp *.tar gitlab-runner@10.116.0.5:~
cd ~
rm -rf workspace