From: Waldemar Kozaczuk <jwkozac...@gmail.com>
Committer: Waldemar Kozaczuk <jwkozac...@gmail.com>
Branch: master
travis: simplify CIRP publishing and add new artifacts
This patch simplifies travis CIRP publishing by collapsing 2 stages
into one. It also adds kernel.elf and httpserver monitoring MPM to
the list of published artifacts.
Signed-off-by: Waldemar Kozaczuk <jwkozac...@gmail.com>
---
diff --git a/.travis.yml b/.travis.yml
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,23 +10,25 @@ before_install:
- pushd docker && docker build -t osv/builder -f ./Dockerfile.builder
--build-arg DIST="ubuntu-19.10" . && popd
- docker run -it --privileged -d --name build osv/builder
stages:
- - build
- - publish
+ - build_and_publish
env:
global:
- CIRP_GITHUB_REPO_SLUG="osvunikernel/osv-nightly-releases"
jobs:
include:
- - stage: build
+ - stage: build_and_publish
script:
- docker exec build ./scripts/build clean
- docker exec build ./scripts/build-capstan-mpm-packages kernel
- docker exec build ./scripts/build-capstan-mpm-packages unit_tests
+ - docker exec build ./scripts/build-capstan-mpm-packages monitoring
- docker exec build ./scripts/osv-version.sh > /tmp/osv-version
- export ARTIFACTS_DIR="$(mktemp -d)"
- cp /tmp/osv-version "$ARTIFACTS_DIR"
- docker cp build:/root/.capstan/repository/osv-loader/osv-loader.qemu
"$ARTIFACTS_DIR"
- gzip "$ARTIFACTS_DIR"/osv-loader.qemu
+ - docker cp
build:/root/.capstan/repository/osv-loader/kernel-stripped.elf
"$ARTIFACTS_DIR"/kernel.elf
+ - gzip "$ARTIFACTS_DIR"/kernel.elf
- docker cp build:/root/.capstan/repository/osv-loader/index.yaml
"$ARTIFACTS_DIR"
- docker cp build:/root/.capstan/packages/osv.bootstrap.mpm
"$ARTIFACTS_DIR"
- docker cp build:/root/.capstan/packages/osv.bootstrap.yaml
"$ARTIFACTS_DIR"
@@ -36,17 +38,8 @@ jobs:
- docker cp build:/root/.capstan/packages/osv.zfs-tests.yaml
"$ARTIFACTS_DIR"
- docker cp build:/root/.capstan/packages/osv.rofs-tests.mpm
"$ARTIFACTS_DIR"
- docker cp build:/root/.capstan/packages/osv.rofs-tests.yaml
"$ARTIFACTS_DIR"
- - ./.travis/cirp/cleanup1.sh
- - ./.travis/cirp/store.sh "$ARTIFACTS_DIR"
- - ./.travis/cirp/cleanup2.sh
- - stage: publish
- script:
- - docker exec build ./scripts/osv-version.sh > /tmp/osv-version
- - export ARTIFACTS_DIR="$(mktemp -d)"
- - ./.travis/cirp/collect.sh "$ARTIFACTS_DIR"
+ - docker cp
build:/root/.capstan/packages/osv.httpserver-monitoring-api.mpm "$ARTIFACTS_DIR"
+ - docker cp
build:/root/.capstan/packages/osv.httpserver-monitoring-api.yaml
"$ARTIFACTS_DIR"
- ./.travis/cirp/cleanup4.sh
- ./.travis/cirp/publish.sh "$ARTIFACTS_DIR" $(cat /tmp/osv-version)
- ./.travis/cirp/cleanup5.sh
- cache:
- directories:
- - /opt/cirp
diff --git a/.travis/cirp/cleanup4.sh b/.travis/cirp/cleanup4.sh
--- a/.travis/cirp/cleanup4.sh
+++ b/.travis/cirp/cleanup4.sh
@@ -27,5 +27,5 @@ set -euo pipefail
. .travis/cirp/install.sh
ci-release-publisher cleanup_publish
-ci-release-publisher cleanup_store --scope current-build
previous-finished-builds \
- --release complete incomplete
+#ci-release-publisher cleanup_store --scope current-build
previous-finished-builds \
+# --release complete incomplete
diff --git a/.travis/cirp/cleanup5.sh b/.travis/cirp/cleanup5.sh
--- a/.travis/cirp/cleanup5.sh
+++ b/.travis/cirp/cleanup5.sh
@@ -33,5 +33,5 @@ fi
. .travis/cirp/install.sh
ci-release-publisher cleanup_publish
-ci-release-publisher cleanup_store --scope current-build
previous-finished-builds \
- --release complete incomplete
+#ci-release-publisher cleanup_store --scope current-build
previous-finished-builds \
+# --release complete incomplete
diff --git a/scripts/build-capstan-mpm-packages
b/scripts/build-capstan-mpm-packages
--- a/scripts/build-capstan-mpm-packages
+++ b/scripts/build-capstan-mpm-packages
@@ -406,6 +406,9 @@ case "$1" in
kernel_and_modules)
echo "Building kernel and standard modules ..."
build_kernel_and_standard_osv_modules;;
+ monitoring)
+ echo "Building httpserver monitoring mpm..."
+ build_httpserver_monitoring_package;;
jdk)
echo "Building Java 8 and 11 JREs ..."
build_java_jdk_packages;;
--
You received this message because you are subscribed to the Google Groups "OSv
Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to osv-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/osv-dev/000000000000c40caf05a4865009%40google.com.
