Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f606ba7
CI: add bifrost to container sync filter
markgoddard Nov 22, 2022
df3c774
Add Pulp config to sync all repos
m-bull Jan 20, 2023
7692128
Use username and password for Pulp authentication
priteau Jan 23, 2023
1e24d3b
Fix path to NFV OpenvSwitch
priteau Jan 23, 2023
b3a81ac
Address review nits
m-bull Jan 24, 2023
fbf9c4e
CI: Update versions used of community GitHub Actions
markgoddard Jan 26, 2023
622aee9
Stop using deprecated set-output command in workflows
markgoddard Jan 26, 2023
19b2650
CI: Rework multiline string GitHub output
markgoddard Jan 31, 2023
005d7a6
Merge pull request #362 from stackhpc/wallaby-update-actions
markgoddard Feb 6, 2023
1be311a
Merge pull request #342 from stackhpc/local-container-builds
markgoddard Feb 6, 2023
8815350
Merge pull request #239 from stackhpc/wallaby-container-sync-fix
markgoddard Feb 6, 2023
d6d8708
Add new pulp repo tags
MoteHue Feb 7, 2023
ab06f7a
Move TLS tags out of distro checks
MoteHue Feb 8, 2023
bce9c4b
Change to new CentOS tags (including bifrost)
MoteHue Feb 8, 2023
e735094
Merge remote-tracking branch 'origin/wallaby-update-pulp-repo-version…
jovial Feb 10, 2023
538c1a8
Remove kolla_enable_nova_libvirt_container
jovial Feb 10, 2023
949649e
Remove duplicate key
jovial Feb 10, 2023
a5d9608
Revert docker repo version to match wallaby
jovial Feb 10, 2023
35c02ae
Add release note for package refresh
MoteHue Feb 13, 2023
ac7b697
Use same repo tags as Wallaby except Xena specific
MoteHue Feb 14, 2023
648dbc4
Add accidentally removed mariadb version
MoteHue Feb 14, 2023
22a0a4a
Change to new CentOS tags
MoteHue Feb 15, 2023
fd28b26
Merge remote-tracking branch 'origin/wallaby-update-pulp-repo-version…
MoteHue Feb 16, 2023
c2eb64f
Fix versions & releases in package refresh note
MoteHue Feb 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions .github/workflows/stackhpc-all-in-one.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ jobs:
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
KAYOBE_IMAGE: ${{ inputs.kayobe_image }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: true

- name: Install terraform
uses: hashicorp/setup-terraform@v1
uses: hashicorp/setup-terraform@v2

- name: Initialise terraform
run: terraform init
Expand Down Expand Up @@ -167,16 +167,14 @@ jobs:
ENABLE_OVN: ${{ inputs.neutron_plugin == 'ovn' }}
OS_DISTRIBUTION: ${{ inputs.os_distribution }}

# https://renehernandez.io/snippets/multiline-strings-as-a-job-output-in-github-actions/
# Use a heredoc to define a multiline string output
# https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
- name: Set SSH key output
id: ssh_key
run: |
ssh_key="$(cat terraform/aio/id_rsa)"
ssh_key="${ssh_key//'%'/'%25'}"
ssh_key="${ssh_key//$'\n'/'%0A'}"
ssh_key="${ssh_key//$'\r'/'%0D'}"
echo "::add-mask::$ssh_key"
echo "::set-output name=ssh_key::$ssh_key"
echo "ssh_key<<EOF" >> $GITHUB_OUTPUT
cat terraform/aio/id_rsa >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT

# The same tag may be reused (e.g. pr-123), so ensure we have the latest image.
- name: Pull latest Kayobe image
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/stackhpc-build-kayobe-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout kayobe config
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true

- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/stackhpc-container-image-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,15 @@ jobs:
# stackhpc-release-train repository.
- name: Trigger container image repository sync
run: |
filter='${{ inputs.regexes }}'
if [[ -n $filter ]] && [[ ${{ github.event.inputs.seed }} == 'true' ]]; then
filter="$filter bifrost"
fi
gh workflow run \
container-sync.yml \
--repo stackhpc/stackhpc-release-train \
--ref main
--ref main \
-f filter="$filter"
env:
GITHUB_TOKEN: ${{ secrets.STACKHPC_RELEASE_TRAIN_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stackhpc-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup Python ${{ matrix.python-version }} 🐍
uses: actions/setup-python@v3
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Tox 📦
Expand Down
10 changes: 10 additions & 0 deletions etc/kayobe/containers/pulp/post.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,13 @@
register: pulp_manager_result
failed_when:
- "'Successfully set password' not in pulp_manager_result.stdout"

- name: Manage Pulp content checksums
become: true
command: >-
docker exec -u root pulp
bash -c
'pulpcore-manager handle-artifact-checksums'
when:
- stackhpc_pulp_sync_for_local_container_build | bool
- pulp_settings.changed
1 change: 1 addition & 0 deletions etc/kayobe/containers/pulp/pre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
dest: /opt/kayobe/containers/pulp/settings.py
mode: 0644
become: true
register: pulp_settings

- name: Configure TLS for local Pulp
when: pulp_enable_tls | bool
Expand Down
4 changes: 4 additions & 0 deletions etc/kayobe/containers/pulp/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
ANSIBLE_API_HOSTNAME='{{ pulp_url }}'
ANSIBLE_CONTENT_HOSTNAME='{{ pulp_url }}/pulp/content'
TOKEN_AUTH_DISABLED=True
{% if stackhpc_pulp_sync_for_local_container_build | bool %}
ALLOWED_CONTENT_CHECKSUMS = ["sha1", "sha224", "sha256", "sha384", "sha512"]
{% endif %}

2 changes: 1 addition & 1 deletion etc/kayobe/kolla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}"

# Kolla OpenStack release version. This should be a Docker image tag.
# Default is {{ openstack_release }}.
kolla_openstack_release: "{% if kolla_base_distro == 'centos' %}xena-20221010T103511{% else %}xena-20221213T204703{% endif %}"
kolla_openstack_release: "{% if kolla_base_distro == 'centos' %}xena-20230214T150257{% else %}xena-20221213T204703{% endif %}"

# Docker tag applied to built container images. Default is
# {{ kolla_openstack_release }}.
Expand Down
15 changes: 4 additions & 11 deletions etc/kayobe/kolla/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,25 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts


{% if kolla_base_distro == 'centos' %}
bifrost_tag: xena-20221128T101757
cinder_tag: xena-20230206T165215
etcd_tag: xena-20230201T095253
glance_tag: xena-20230206T165215
glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
magnum_tag: xena-20230131T144233
neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
nova_tag: xena-20230206T165215
rabbitmq_tag: xena-20230105T141714
bifrost_tag: xena-20230214T165534
{% else %}
bifrost_tag: xena-20221213T224057
cinder_tag: xena-20230206T165220
etcd_tag: xena-20230201T131415
glance_tag: xena-20230206T165220
glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
kolla_toolbox_tag: xena-20230104T145414
magnum_tag: xena-20230131T151601
neutron_tag: xena-20230104T145414
neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
nova_tag: xena-20230206T165220
octavia_tag: xena-20230104T145414
openvswitch_tag: xena-20230104T145414
ovn_tag: xena-20230104T145414
rabbitmq_tag: xena-20230105T145825
{% endif %}

glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"
neutron_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}"

om_enable_rabbitmq_high_availability: true

#############################################################################
Expand Down
30 changes: 15 additions & 15 deletions etc/kayobe/pulp-repo-versions.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
---
# Do not edit! This file is autogenerated by Ansible.
stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435
stackhpc_pulp_repo_centos_stream_8_appstream_version: 20220817T082321
stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220817T082321
stackhpc_pulp_repo_centos_stream_8_appstream_version: 20230201T025809
stackhpc_pulp_repo_centos_stream_8_baseos_version: 20230201T025809
stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901
stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20220609T110556
stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220824T113700
stackhpc_pulp_repo_centos_stream_8_openstack_xena_version: 20220823T042339
stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20230203T025251
stackhpc_pulp_repo_centos_stream_8_openstack_xena_version: 20230209T034107
stackhpc_pulp_repo_centos_stream_8_opstools_version: 20220617T100837
stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220817T082321
stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220803T043053
stackhpc_pulp_repo_centos_stream_8_powertools_version: 20230201T025809
stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20230201T025809
stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220708T132615
stackhpc_pulp_repo_docker_version: 20220828T050510
stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20220825T041159
stackhpc_pulp_repo_epel_modular_version: 20220828T050510
stackhpc_pulp_repo_epel_version: 20220830T054227
stackhpc_pulp_repo_grafana_version: 20220831T050502
stackhpc_pulp_repo_mariadb_10_5_centos8_version: 20220817T082321
stackhpc_pulp_repo_rabbitmq_erlang_version: 20220828T050510
stackhpc_pulp_repo_rabbitmq_server_version: 20220803T043053
stackhpc_pulp_repo_treasuredata_4_version: 20220823T042339
stackhpc_pulp_repo_docker_version: 20230203T025251
stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20230203T025251
stackhpc_pulp_repo_epel_modular_version: 20220913T043117
stackhpc_pulp_repo_epel_version: 20230206T150339
stackhpc_pulp_repo_grafana_version: 20230207T024123
stackhpc_pulp_repo_mariadb_10_5_centos8_version: 20230206T150339
stackhpc_pulp_repo_rabbitmq_erlang_version: 20221229T025716
stackhpc_pulp_repo_rabbitmq_server_version: 20230201T025809
stackhpc_pulp_repo_treasuredata_4_version: 20221105T035018
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220804T040153
stackhpc_pulp_repo_ubuntu_focal_security_version: 20220804T040153
stackhpc_pulp_repo_ubuntu_focal_version: 20220804T040153
Expand Down
Loading