Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package habootstrap-formula for
openSUSE:Factory checked in at 2021-06-04 00:34:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/habootstrap-formula (Old)
and /work/SRC/openSUSE:Factory/.habootstrap-formula.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "habootstrap-formula"
Fri Jun 4 00:34:03 2021 rev:22 rq:897228 version:0.4.1+git.1622731415.6c3fd47
Changes:
--------
--- /work/SRC/openSUSE:Factory/habootstrap-formula/habootstrap-formula.changes
2021-01-28 21:22:43.475668465 +0100
+++
/work/SRC/openSUSE:Factory/.habootstrap-formula.new.1898/habootstrap-formula.changes
2021-06-04 00:34:22.733012176 +0200
@@ -1,0 +2,6 @@
+Thu Mar 11 15:03:24 UTC 2021 - C??dric Bosdonnat <[email protected]>
+
+- Fix SUSE Manager integration
+ (bsc#1181731)
+
+-------------------------------------------------------------------
Old:
----
habootstrap-formula-0.4.1+git.1611775401.451718e.tar.gz
New:
----
habootstrap-formula-0.4.1+git.1622731415.6c3fd47.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ habootstrap-formula.spec ++++++
--- /var/tmp/diff_new_pack.RPTW44/_old 2021-06-04 00:34:23.145013363 +0200
+++ /var/tmp/diff_new_pack.RPTW44/_new 2021-06-04 00:34:23.149013374 +0200
@@ -20,7 +20,7 @@
Name: habootstrap-formula
Group: System/Packages
-Version: 0.4.1+git.1611775401.451718e
+Version: 0.4.1+git.1622731415.6c3fd47
Release: 0
Summary: HA cluster (crmsh) deployment salt formula
++++++ _service ++++++
--- /var/tmp/diff_new_pack.RPTW44/_old 2021-06-04 00:34:23.177013455 +0200
+++ /var/tmp/diff_new_pack.RPTW44/_new 2021-06-04 00:34:23.177013455 +0200
@@ -5,7 +5,7 @@
<param name="exclude">.git</param>
<param name="filename">habootstrap-formula</param>
<param name="versionformat">0.4.1+git.%ct.%h</param>
- <param name="revision">451718e7f1cb717eb5cc65e7c5cfb73f2e2079e7</param>
+ <param name="revision">6c3fd4714301224d19a8bcbc81f690e05f0ea6bd</param>
</service>
<service name="recompress" mode="disabled">
++++++ habootstrap-formula-0.4.1+git.1611775401.451718e.tar.gz ->
habootstrap-formula-0.4.1+git.1622731415.6c3fd47.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1611775401.451718e/.github/workflows/formula-ci.yml
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/.github/workflows/formula-ci.yml
---
old/habootstrap-formula-0.4.1+git.1611775401.451718e/.github/workflows/formula-ci.yml
1970-01-01 01:00:00.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/.github/workflows/formula-ci.yml
2021-06-03 16:43:35.000000000 +0200
@@ -0,0 +1,81 @@
+name: Formula CI
+
+# this workflow will
+# - run formula validation step - test/validate-formula.sh
+# - deliver the package content to the configured repository
+# - submit the new package content to the upstream repository
+
+on: [push, pull_request]
+
+env:
+ PACKAGE_NAME: habootstrap-formula
+
+jobs:
+ validation:
+ runs-on: ubuntu-18.04
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ - name: add salt repository
+ uses: myci-actions/add-deb-repo@4
+ with:
+ repo: deb http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/
bionic main
+ key-server:
http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub
+ - name: install salt
+ run: sudo apt-get install salt-common
+ - name: validation
+ run: test/validate-formula.sh
+
+ delivery:
+ needs: validation
+ runs-on: ubuntu-18.04
+ if: ${{ github.event_name != 'pull_request' }}
+ container:
+ image: shap/continuous_deliver
+ env:
+ OBS_USER: ${{ secrets.OBS_USER }}
+ OBS_PASS: ${{ secrets.OBS_PASS }}
+ OBS_PROJECT: ${{ secrets.OBS_PROJECT }}
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ # OSC credentials must be configured beforehand as the HOME variables
cannot be changed from /github/home
+ # that is used to run osc commands
+ - name: configure OSC
+ run: |
+ /scripts/init_osc_creds.sh
+ mkdir -p $HOME/.config/osc
+ cp /root/.config/osc/oscrc $HOME/.config/osc
+ - name: deliver package
+ run: |
+ sed -i 's~%%VERSION%%~${{ github.sha }}~' _service && \
+ sed -i 's~%%REPOSITORY%%~${{ github.repository }}~' _service && \
+ /scripts/upload.sh
+
+ submission:
+ needs: [validation, delivery]
+ runs-on: ubuntu-18.04
+ if: ${{ github.event_name != 'pull_request' && github.ref ==
'refs/heads/master' }}
+ container:
+ image: shap/continuous_deliver
+ env:
+ OBS_USER: ${{ secrets.OBS_USER }}
+ OBS_PASS: ${{ secrets.OBS_PASS }}
+ OBS_PROJECT: ${{ secrets.OBS_PROJECT }}
+ TARGET_PROJECT: ${{ secrets.TARGET_PROJECT }}
+ steps:
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: 0
+ - name: configure OSC
+ run: |
+ /scripts/init_osc_creds.sh
+ mkdir -p $HOME/.config/osc
+ cp /root/.config/osc/oscrc $HOME/.config/osc
+ - name: submit package
+ run: |
+ sed -i 's~%%VERSION%%~${{ github.sha }}~' _service && \
+ sed -i 's~%%REPOSITORY%%~${{ github.repository }}~' _service && \
+ /scripts/submit.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1611775401.451718e/.travis.yml
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/.travis.yml
--- old/habootstrap-formula-0.4.1+git.1611775401.451718e/.travis.yml
2021-01-27 20:23:21.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/.travis.yml
1970-01-01 01:00:00.000000000 +0100
@@ -1,57 +0,0 @@
-sudo: required
-services:
- - docker
-
-dist: bionic
-addons:
- apt:
- sources:
- - sourceline: 'deb
http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/ bionic main'
- key_url:
'http://repo.saltstack.com/apt/ubuntu/18.04/amd64/3000/SALTSTACK-GPG-KEY.pub'
- packages:
- - salt-common
-
-stages:
- - validation
- - delivery
- - submit
-
-jobs:
- include:
- - stage: validation
- script:
- - |
- # validate states
- test/validate-formula.sh
-
- - stage: delivery
- if: type != pull_request
- env:
- - FOLDER=/package
- - PACKAGE_NAME=habootstrap-formula
-
- before_install:
- - docker pull shap/continuous_deliver:latest
-
- script:
- - |
- docker run -t -v "$(pwd):/package" -w /package \
- -e OBS_USER -e OBS_PASS -e FOLDER -e OBS_PROJECT -e PACKAGE_NAME \
- shap/continuous_deliver \
- /bin/bash -c "sed -i 's~%%VERSION%%~$TRAVIS_COMMIT~' _service && \
- sed -i 's~%%REPOSITORY%%~$TRAVIS_REPO_SLUG~' _service && \
- /scripts/upload.sh"
-
- - stage: submit
- if: type != pull_request AND branch = master
- env:
- - PACKAGE_NAME=habootstrap-formula
-
- before_install:
- - docker pull shap/continuous_deliver:latest
-
- script:
- - |
- docker run -t -v "$(pwd):/package" -w /package \
- -e OBS_USER -e OBS_PASS -e OBS_PROJECT -e PACKAGE_NAME -e
TARGET_PROJECT shap/continuous_deliver \
- /scripts/submit.sh
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1611775401.451718e/README.md
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/README.md
--- old/habootstrap-formula-0.4.1+git.1611775401.451718e/README.md
2021-01-27 20:23:21.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/README.md
2021-06-03 16:43:35.000000000 +0200
@@ -1,3 +1,5 @@
+
+
# HA Cluster bootstrap Salt formula
Salt formula to bootstrap and manage a [ClusterLabs](https://clusterlabs.org/)
high availability cluster.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1611775401.451718e/cluster/map.jinja
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/map.jinja
--- old/habootstrap-formula-0.4.1+git.1611775401.451718e/cluster/map.jinja
2021-01-27 20:23:21.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/map.jinja
2021-06-03 16:43:35.000000000 +0200
@@ -4,6 +4,6 @@
{% import_yaml "cluster/defaults.yaml" as defaults %}
{% set cluster = salt['pillar.get']('cluster', default=defaults.cluster,
merge=True) %}
-{% if cluster.configure_checkbox is defined and cluster.configure_checkbox is
sameas false %}
+{% if not cluster.configure_checkbox|default(false) %}
{% do cluster.pop('configure', none) %}
{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1611775401.451718e/cluster/pre_validation.sls
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/pre_validation.sls
---
old/habootstrap-formula-0.4.1+git.1611775401.451718e/cluster/pre_validation.sls
2021-01-27 20:23:21.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/cluster/pre_validation.sls
2021-06-03 16:43:35.000000000 +0200
@@ -1,7 +1,7 @@
{% from "cluster/map.jinja" import cluster with context -%}
-{% if cluster.configure_checkbox is defined %}
- {% if cluster.configure.configure_url_checkbox is sameas true %}
+{% if cluster.configure_checkbox|default(false) %}
+ {% if cluster.configure.configure_url_checkbox|default(false) %}
{% do cluster.configure.pop('template', none) %}
{% else %}
{% do cluster.configure.pop('url', none) %}
@@ -15,11 +15,11 @@
{% endif %}
{% endif %}
-{% if cluster.sbd is defined and cluster.sbd_checkbox is defined %}
- {% if cluster.sbd.diskless_checkbox is defined and
cluster.sbd.diskless_checkbox is sameas true %}
+{% if cluster.sbd is defined and cluster.sbd_checkbox|default(false) %}
+ {% if cluster.sbd.diskless_checkbox|default(false) %}
{% do cluster.sbd.update({'device': false}) %}
{% endif %}
- {% if cluster.sbd.configure_sbd_checkbox is defined and
cluster.sbd.configure_sbd_checkbox is sameas false %}
+ {% if not cluster.sbd.configure_sbd_checkbox|default(false) %}
{% do cluster.sbd.pop('configure_resource', none) %}
{% endif %}
{% endif %}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1611775401.451718e/form.yml
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/form.yml
--- old/habootstrap-formula-0.4.1+git.1611775401.451718e/form.yml
2021-01-27 20:23:21.000000000 +0100
+++ new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/form.yml
2021-06-03 16:43:35.000000000 +0200
@@ -55,7 +55,6 @@
watchdog_checkbox:
$name: Configure watchdog
$type: boolean
- $optional: true
$default: false
watchdog:
$name: Watchdog configuration
@@ -76,7 +75,6 @@
sbd_checkbox:
$name: Configure SBD device and SBD cluster resource
$type: boolean
- $optional: true
$default: false
sbd:
$name: SBD configuration
@@ -87,7 +85,6 @@
$name: Diskless SBD (If device is set this option is skipped)
$type: boolean
$default: false
- $optional: true
device:
$visibleIf: .diskless_checkbox == false
$name: SBD Device(s)
@@ -113,13 +110,11 @@
$name: Force commit
$type: boolean
$default: false
- $optional: true
$help: Force commit. Use with caution, this can allow invalid
parameters in the configuration
configure_resource_params:
$name: Configure SBD resource parameters
$type: boolean
$default: false
- $optional: true
$help: Mark this option to configure SBD resource parameters
params:
$name: parameters
@@ -128,7 +123,7 @@
$optional: true
$prototype:
$name: New parameter
- key:
+ $key:
$name: Parameter name
$optional: true
value:
@@ -138,7 +133,6 @@
$name: Configure SBD resource operations
$type: boolean
$default: false
- $optional: true
$help: Mark this option to configure SBD resource operations like
monitor
op:
$name: operation
@@ -155,7 +149,7 @@
$type: edit-group
$prototype:
$name: Monitor op parameter
- key:
+ $key:
$name: Parameter
value:
$name: New value
@@ -165,7 +159,7 @@
$type: edit-group
$prototype:
$name: start op parameter
- key:
+ $key:
$name: Parameter
value:
$name: New value
@@ -176,7 +170,7 @@
$optional: true
$prototype:
$name: stop op parameter
- key:
+ $key:
$name: Parameter
value:
$name: New value
@@ -184,7 +178,6 @@
$name: Configure SBD meta attributes
$type: boolean
$default: false
- $optional: true
$help: Mark this option to configure meta attributes
meta:
$name: meta
@@ -193,7 +186,7 @@
$optional: true
$prototype:
$name: meta attribute
- key:
+ $key:
$name: attribute name
$optional: true
value:
@@ -203,7 +196,6 @@
sshkeys_checkbox:
$name: Manage ssh key usage
$type: boolean
- $optional: true
$default: false
sshkeys:
$name: SSH keys configuration
@@ -214,7 +206,6 @@
$name: Share SSH keys information
$type: boolean
$default: false
- $optional: true
password:
$visibleIf: .authorize_keys == true
$name: First node root password
@@ -224,7 +215,6 @@
resource_agents_checkbox:
$name: Install new resource agents
$type: boolean
- $optional: true
$default: false
resource_agents:
$name: Resource agents to install
@@ -241,7 +231,6 @@
corosync_checkbox:
$name: Configure corosync
$type: boolean
- $optional: true
$default: false
corosync:
$name: Corosync configuration
@@ -251,7 +240,7 @@
$prototype:
$name: Corosync parameter
$optional: true
- key:
+ $key:
$name: Parameter name
$optional: true
value:
@@ -259,7 +248,7 @@
$type: edit-group
$minItems: 0
$prototype:
- key:
+ $key:
$name: Option name
$optional: true
value:
@@ -269,7 +258,6 @@
configure_checkbox:
$name: Configure resource agents with configuration file
$type: boolean
- $optional: true
$default: false
configure:
$visibleIf: .configure_checkbox == true
@@ -280,7 +268,6 @@
$name: Configure cluster properties
$type: boolean
$default: false
- $optional: true
properties:
$name: Cluster properties
$visibleIf: .properties_checkbox == true
@@ -288,7 +275,7 @@
$type: edit-group
$prototype:
$name: configure properties
- key:
+ $key:
$name: Property name
$optional: true
value:
@@ -298,14 +285,13 @@
$name: Configure resource defaults
$type: boolean
$default: false
- $optional: true
rsc_defaults:
$name: Resource defaults
$visibleIf: .rsc_defaults_checkbox == true
$type: edit-group
$prototype:
$name: Resource defaults
- key:
+ $key:
$name: name
$optional: true
value:
@@ -315,14 +301,13 @@
$name: Configure operations defaults
$type: boolean
$default: false
- $optional: true
op_defaults:
$name: Operation defaults
$visibleIf: .op_defaults_checkbox == true
$type: edit-group
$prototype:
$name: Operation defaults
- key:
+ $key:
$name: name
$optional: true
value:
@@ -343,12 +328,10 @@
$name: Configuration file is xml format
$type: boolean
$default: false
- $optional: true
configure_url_checkbox:
$name: Use configuration file (template otherwise)
$type: boolean
$default: true
- $optional: true
url:
$visibleIf: .configure_url_checkbox == true
$name: Configuration file url (if used template data is skipped)
@@ -373,7 +356,7 @@
$itemName: ""
$prototype:
$name: New parameter
- key:
+ $key:
$name: Parameter name
$optional: true
value:
@@ -383,7 +366,6 @@
remove_checkbox:
$name: Remove cluster node(s)
$type: boolean
- $optional: true
$default: false
remove:
$name: Remove node(s) from cluster
@@ -407,7 +389,6 @@
$name: Update the cluster password
$type: boolean
$default: false
- $optional: true
hacluster_password:
$visibleIf: .change_hacluster_password == true
$name: New HA cluster password
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/habootstrap-formula-0.4.1+git.1611775401.451718e/habootstrap-formula.changes
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/habootstrap-formula.changes
---
old/habootstrap-formula-0.4.1+git.1611775401.451718e/habootstrap-formula.changes
2021-01-27 20:23:21.000000000 +0100
+++
new/habootstrap-formula-0.4.1+git.1622731415.6c3fd47/habootstrap-formula.changes
2021-06-03 16:43:35.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Mar 11 15:03:24 UTC 2021 - C??dric Bosdonnat <[email protected]>
+
+- Fix SUSE Manager integration
+ (bsc#1181731)
+
+-------------------------------------------------------------------
Wed Jan 27 12:30:35 UTC 2021 - Xabier Arbulu <[email protected]>
- Version bump 0.4.1
