particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

master → main

Browse source
This commit is contained in:
Lars Karlitski 2020-11-13 11:46:23 +01:00 • committed by Tom Gundersen
parent ea7acf7051
commit 7228d79003
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -350,9 +350,9 @@ release:
@echo
@echo " git tag -s -m 'osbuild $(NEXT_VERSION)' v$(NEXT_VERSION) HEAD"
@echo
@echo " * Push master as well as the tag:"
@echo " * Push main as well as the tag:"
@echo
@echo " git push origin master"
@echo " git push origin main"
@echo " git push origin v$(NEXT_VERSION)"
@echo
@echo " * Create a release on github. Use 'NEWS.md' verbatim from the"

8
schutzbot/Jenkinsfile vendored
View file

@ -142,8 +142,8 @@ pipeline {
success {
node('schutzbot') {
script {
if (env.BRANCH_NAME == 'master') {
telegramSend "💚 CI passed for osbuild master branch ${env.BUILD_URL}"
if (env.BRANCH_NAME == 'main') {
telegramSend "💚 CI passed for osbuild main branch ${env.BUILD_URL}"
}
}
}
@ -151,8 +151,8 @@ pipeline {
unsuccessful {
node('schutzbot') {
script {
if (env.BRANCH_NAME == 'master') {
telegramSend "💣 CI failed for osbuild master branch ${env.BUILD_URL}"
if (env.BRANCH_NAME == 'main') {
telegramSend "💣 CI failed for osbuild main branch ${env.BUILD_URL}"
}
}
}

2
schutzbot/run_image_tests.sh
View file

@ -58,7 +58,7 @@ run_test_case () {
AZURE_CREDS=${AZURE_CREDS-/dev/null}
OPENSTACK_CREDS=${OPENSTACK_CREDS-/dev/null}
VCENTER_CREDS=${VCENTER_CREDS-/dev/null}
TEST_CMD="env $(cat "$AZURE_CREDS" "$OPENSTACK_CREDS" "$VCENTER_CREDS") BRANCH_NAME=${BRANCH_NAME-master} BUILD_ID=$BUILD_ID DISTRO_CODE=$DISTRO_CODE $TEST_RUNNER -test.v ${IMAGE_TEST_CASES_PATH}/${TEST_CASE_FILENAME}"
TEST_CMD="env $(cat "$AZURE_CREDS" "$OPENSTACK_CREDS" "$VCENTER_CREDS") BRANCH_NAME=${BRANCH_NAME-main} BUILD_ID=$BUILD_ID DISTRO_CODE=$DISTRO_CODE $TEST_RUNNER -test.v ${IMAGE_TEST_CASES_PATH}/${TEST_CASE_FILENAME}"
# Run the test and add the test name to the list of passed or failed
# tests depending on the result.