Skip to content

Commit 3368954

Browse files
github-actions[bot]electrocucaracha
github-actions[bot]
and
electrocucaracha
authored
chore: update gh (#258)
* Update GitHub Actions * Upgrade OpenStack Kolla dependencies --------- Co-authored-by: gh versions bot <[email protected]>
1 parent 42055c0 commit 3368954

File tree

19 files changed

+497
-497
lines changed

19 files changed

+497
-497
lines changed

‎.github/actions/docker-image/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ runs:
2020
with:
2121
image: ${{ inputs.image }}
2222
- name: Run Trivy vulnerability scanner
23-
uses: aquasecurity/trivy-action@76071ef0d7ec797419534a183b498b4d6366cf37 # 0.31.0
23+
uses: aquasecurity/trivy-action@dc5a429b52fcf669ce959baa2c2dd26090d2a6c4 # 0.32.0
2424
with:
2525
image-ref: "${{ inputs.image }}"
2626
format: sarif

‎ci/check_aio.sh‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
set -o errexit
1212
set -o pipefail
1313
if [[ ${OS_DEBUG:-false} == "true" ]]; then
14-
set -o xtrace
14+
set -o xtrace
1515
fi
1616

1717
export OS_DISTRO="${OS_DISTRO:-ubuntu_22}"
@@ -22,65 +22,65 @@ export OS_KOLLA_ENABLE_HORIZON="no"
2222
export OS_KOLLA_KOLLA_INSTALL_TYPE="source"
2323

2424
function info {
25-
_print_msg "INFO" "$1"
26-
echo "::notice::$1"
25+
_print_msg "INFO" "$1"
26+
echo "::notice::$1"
2727
}
2828

2929
function warn {
30-
_print_msg "WARN" "$1"
31-
echo "::warning::$1"
30+
_print_msg "WARN" "$1"
31+
echo "::warning::$1"
3232
}
3333

3434
function _print_msg {
35-
echo "$(date +%H:%M:%S) - $1: $2"
35+
echo "$(date +%H:%M:%S) - $1: $2"
3636
}
3737

3838
function get_release {
39-
local release_pointer=${CI_INITIAL_RELEASE_POINTER:-3}
39+
local release_pointer=${CI_INITIAL_RELEASE_POINTER:-3}
4040

41-
until [ -f "./requirements/$(sed -n "${release_pointer}p" releases.txt)/${OS_DISTRO}.txt" ]; do
42-
release_pointer=$((release_pointer - 1))
43-
if [[ $release_pointer -lt "0" ]]; then
44-
return
45-
fi
46-
done
41+
until [ -f "./requirements/$(sed -n "${release_pointer}p" releases.txt)/${OS_DISTRO}.txt" ]; do
42+
release_pointer=$((release_pointer - 1))
43+
if [[ $release_pointer -lt "0" ]]; then
44+
return
45+
fi
46+
done
4747

48-
sed -n "${release_pointer}p" releases.txt
48+
sed -n "${release_pointer}p" releases.txt
4949
}
5050

5151
function upgrade {
52-
local initial_release=$1
52+
local initial_release=$1
5353

54-
release_pointer=$(cat -n releases.txt | grep "$initial_release" | awk '{print $1}')
55-
release_pointer=$((release_pointer - 1))
54+
release_pointer=$(cat -n releases.txt | grep "$initial_release" | awk '{print $1}')
55+
release_pointer=$((release_pointer - 1))
5656

57-
while [[ $release_pointer -gt "0" ]]; do
58-
release_name="$(sed -n "${release_pointer}p" releases.txt)"
57+
while [[ $release_pointer -gt "0" ]]; do
58+
release_name="$(sed -n "${release_pointer}p" releases.txt)"
5959

60-
if [ -f "./requirements/${release_name}/${OS_DISTRO}.txt" ]; then
61-
pushd samples/aio/ >/dev/null
62-
info "Upgrading ${OS_DISTRO} distro to OpenStack ${release_name} release"
63-
vagrant ssh -- "cd /vagrant; OPENSTACK_RELEASE=$release_name OS_DEBUG=true ./upgrade.sh"
64-
print_hw_stats
65-
popd >/dev/null
66-
else
67-
warn "There is no more releases for ${OS_DISTRO} distro"
68-
break
69-
fi
70-
release_pointer=$((release_pointer - 1))
71-
done
60+
if [ -f "./requirements/${release_name}/${OS_DISTRO}.txt" ]; then
61+
pushd samples/aio/ >/dev/null
62+
info "Upgrading ${OS_DISTRO} distro to OpenStack ${release_name} release"
63+
vagrant ssh -- "cd /vagrant; OPENSTACK_RELEASE=$release_name OS_DEBUG=true ./upgrade.sh"
64+
print_hw_stats
65+
popd >/dev/null
66+
else
67+
warn "There is no more releases for ${OS_DISTRO} distro"
68+
break
69+
fi
70+
release_pointer=$((release_pointer - 1))
71+
done
7272
}
7373

7474
function print_hw_stats {
75-
! command -v vm_stat >/dev/null || vm_stat
76-
! command -v VBoxManage >/dev/null || VBoxManage list runningvms --long
77-
! command -v virsh >/dev/null || virsh list
75+
! command -v vm_stat >/dev/null || vm_stat
76+
! command -v VBoxManage >/dev/null || VBoxManage list runningvms --long
77+
! command -v virsh >/dev/null || virsh list
7878
}
7979

8080
initial_release=$(get_release)
8181
if [[ -z $initial_release ]]; then
82-
warn "There is no OpenStack release supported for ${OS_DISTRO}"
83-
exit
82+
warn "There is no OpenStack release supported for ${OS_DISTRO}"
83+
exit
8484
fi
8585
pushd samples/aio/ >/dev/null
8686
info "Deploying ${OS_DISTRO} distro with OpenStack ${initial_release} release"

‎ci/update_distros.sh‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -11,73 +11,73 @@
1111
set -o errexit
1212
set -o pipefail
1313
if [[ ${OS_DEBUG:-false} == "true" ]]; then
14-
set -o xtrace
14+
set -o xtrace
1515
fi
1616

1717
PROVIDER=${PROVIDER:-virtualbox}
1818
msg=""
1919

2020
function _get_box_current_version {
21-
version=""
22-
attempt_counter=0
23-
max_attempts=5
24-
name="$1"
21+
version=""
22+
attempt_counter=0
23+
max_attempts=5
24+
name="$1"
2525

26-
if [ -f ./ci/pinned_vagrant_boxes.txt ] && grep -q "^${name} .*$PROVIDER" ./ci/pinned_vagrant_boxes.txt; then
27-
version=$(grep "^${name} .*$PROVIDER" ./ci/pinned_vagrant_boxes.txt | awk '{ print $2 }')
28-
else
29-
until [ "$version" ]; do
30-
metadata="$(curl -s "https://app.vagrantup.com/api/v1/box/$name")"
31-
if [ "$metadata" ]; then
32-
version="$(echo "$metadata" | python -c 'import json,sys;print(json.load(sys.stdin)["current_version"]["version"])')"
33-
break
34-
elif [ ${attempt_counter} -eq ${max_attempts} ]; then
35-
echo "Max attempts reached"
36-
exit 1
37-
fi
38-
attempt_counter=$((attempt_counter + 1))
39-
sleep $((attempt_counter * 2))
40-
done
41-
fi
26+
if [ -f ./ci/pinned_vagrant_boxes.txt ] && grep -q "^${name} .*$PROVIDER" ./ci/pinned_vagrant_boxes.txt; then
27+
version=$(grep "^${name} .*$PROVIDER" ./ci/pinned_vagrant_boxes.txt | awk '{ print $2 }')
28+
else
29+
until [ "$version" ]; do
30+
metadata="$(curl -s "https://app.vagrantup.com/api/v1/box/$name")"
31+
if [ "$metadata" ]; then
32+
version="$(echo "$metadata" | python -c 'import json,sys;print(json.load(sys.stdin)["current_version"]["version"])')"
33+
break
34+
elif [ ${attempt_counter} -eq ${max_attempts} ]; then
35+
echo "Max attempts reached"
36+
exit 1
37+
fi
38+
attempt_counter=$((attempt_counter + 1))
39+
sleep $((attempt_counter * 2))
40+
done
41+
fi
4242

43-
echo "${version#*v}"
43+
echo "${version#*v}"
4444
}
4545

4646
function _vagrant_pull {
47-
local alias="$1"
48-
local name="$2"
49-
local project_id="$3"
50-
local family="$4"
51-
local vb_controller="${5:-IDE Controller}"
47+
local alias="$1"
48+
local name="$2"
49+
local project_id="$3"
50+
local family="$4"
51+
local vb_controller="${5:-IDE Controller}"
5252

53-
version=$(_get_box_current_version "$name")
53+
version=$(_get_box_current_version "$name")
5454

55-
if [ "$(curl "https://app.vagrantup.com/${name%/*}/boxes/${name#*/}/versions/$version/providers/$PROVIDER.box" -o /dev/null -w '%{http_code}\n' -s)" == "302" ] && [ "$(vagrant box list | grep -c "$name .*$PROVIDER, $version")" != "1" ]; then
56-
vagrant box remove --provider "$PROVIDER" --all --force "$name" || :
57-
vagrant box add --provider "$PROVIDER" --box-version "$version" "$name"
58-
elif [ "$(vagrant box list | grep -c "$name .*$PROVIDER, $version")" == "1" ]; then
59-
echo "$name($version, $PROVIDER) box is already present in the host"
60-
else
61-
msg+="$name($version, $PROVIDER) box doesn't exist\n"
62-
return
63-
fi
64-
# editorconfig-checker-disable
65-
# prettier-ignore-start
66-
cat <<EOT >>.distros_supported.yml
55+
if [ "$(curl "https://app.vagrantup.com/${name%/*}/boxes/${name#*/}/versions/$version/providers/$PROVIDER.box" -o /dev/null -w '%{http_code}\n' -s)" == "302" ] && [ "$(vagrant box list | grep -c "$name .*$PROVIDER, $version")" != "1" ]; then
56+
vagrant box remove --provider "$PROVIDER" --all --force "$name" || :
57+
vagrant box add --provider "$PROVIDER" --box-version "$version" "$name"
58+
elif [ "$(vagrant box list | grep -c "$name .*$PROVIDER, $version")" == "1" ]; then
59+
echo "$name($version, $PROVIDER) box is already present in the host"
60+
else
61+
msg+="$name($version, $PROVIDER) box doesn't exist\n"
62+
return
63+
fi
64+
# editorconfig-checker-disable
65+
# prettier-ignore-start
66+
cat <<EOT >>.distros_supported.yml
6767
$alias:
6868
name: $name
6969
vb_controller: $vb_controller
7070
version: "$version"
7171
project_id: $project_id
7272
family: $family
7373
EOT
74-
# prettier-ignore-end
75-
# editorconfig-checker-enable
74+
# prettier-ignore-end
75+
# editorconfig-checker-enable
7676
}
7777

7878
if ! command -v vagrant >/dev/null; then
79-
# NOTE: Shorten link -> https://raw.githubusercontent.com/electrocucaracha/pkg-mgr_scripts/master/install.sh
80-
curl -fsSL http://bit.ly/install_pkg | PKG=vagrant bash
79+
# NOTE: Shorten link -> https://raw.githubusercontent.com/electrocucaracha/pkg-mgr_scripts/master/install.sh
80+
curl -fsSL http://bit.ly/install_pkg | PKG=vagrant bash
8181
fi
8282

8383
cat <<EOT >.distros_supported.yml
@@ -98,8 +98,8 @@ _vagrant_pull "debian_11" "debian/bullseye64" "debian-cloud" "debian-11" "SATA C
9898
_vagrant_pull "debian_12" "debian/bookworm64" "debian-cloud" "debian-12" "SATA Controller"
9999

100100
if [ "$msg" ]; then
101-
echo -e "$msg"
102-
rm .distros_supported.yml
101+
echo -e "$msg"
102+
rm .distros_supported.yml
103103
else
104-
mv .distros_supported.yml distros_supported.yml
104+
mv .distros_supported.yml distros_supported.yml
105105
fi

‎ci/update_versions.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
set -o errexit
1212
set -o pipefail
1313
if [[ ${OS_DEBUG:-false} == "true" ]]; then
14-
set -o xtrace
14+
set -o xtrace
1515
fi
1616

1717
trap "make fmt" EXIT
1818

1919
# Update GitHub Action commit hashes
2020
gh_actions=$(grep -r "uses: [a-zA-Z\-]*/[\_a-z\-]*@" .github/ | sed 's/@.*//' | awk -F ': ' '{ print $3 }' | sort -u)
2121
for action in $gh_actions; do
22-
commit_hash=$(git ls-remote "https://github.com/$action" | grep 'refs/tags/[v]\?[0-9][0-9\.]*$' | sed 's|refs/tags/[vV]\?[\.]\?||g' | sort -u -k2 -V | tail -1 | awk '{ printf "%s # %s\n",$1,$2 }')
23-
# shellcheck disable=SC2267
24-
grep -ElRZ "uses: $action@" .github/ | xargs -0 -l sed -i -e "s|uses: $action@.*|uses: $action@$commit_hash|g"
22+
commit_hash=$(git ls-remote "https://github.com/$action" | grep 'refs/tags/[v]\?[0-9][0-9\.]*$' | sed 's|refs/tags/[vV]\?[\.]\?||g' | sort -u -k2 -V | tail -1 | awk '{ printf "%s # %s\n",$1,$2 }')
23+
# shellcheck disable=SC2267
24+
grep -ElRZ "uses: $action@" .github/ | xargs -0 -l sed -i -e "s|uses: $action@.*|uses: $action@$commit_hash|g"
2525
done

0 commit comments

Comments
 (0)