releng/common-packer.git
22 months agoMerge "Feat!: Convert packer templates to HCL2 format" v0.14.0
Anil Belur [Thu, 29 Jun 2023 06:40:50 +0000 (06:40 +0000)]
Merge "Feat!: Convert packer templates to HCL2 format"

23 months agoFeat!: Convert packer templates to HCL2 format 59/71859/6
Anil Belur [Fri, 16 Jun 2023 04:00:04 +0000 (14:00 +1000)]
Feat!: Convert packer templates to HCL2 format

As of packer version 1.7.0 HCL2 is the preferred way to write Packer
templates. HCL2 preserves existing workflows while leveraging HCL2’s
advanced features like variable interpolation and configuration
composability.

Migrate packer templates from JSON to HCL2 format. JSON format
templates are deprecated and no longer works with packer
version > 1.9.x.

Packer version 1.9.1 will be minimum required version for packer jobs.
This version requires installing the cloud specific plugins through
packer config and needs to be initalized and downloaded with
`packer init` before running `packer build`.

Add support for host key algorithms to work with local ssh proxy
without which packer builds results in "failed to handshake" error.
Workaround is to pass additional params with "extra_arguments".

Support for '.json' templates will be removed from common-packer in
subsequent releases. All projects specific templates not available in this
repository are required to convert existing '.json' to '.pkr.hcl' format.

This change requires updating CI jobs with the additional steps.

Ref:
https://developer.hashicorp.com/packer/docs/templates/hcl_templates
https://github.com/hashicorp/packer-plugin-openstack/blob/main/README.md
https://github.com/hashicorp/packer-plugin-ansible/issues/140

Issue: RELENG-4764
Change-Id: Ie63d9551bd1bab224dc9335d45a21d5ee3e09550
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
23 months agoFeat: Modify Devstack templates to include Debian/Ubuntu 60/71860/2
Matthew Watkins [Tue, 20 Jun 2023 11:00:52 +0000 (12:00 +0100)]
Feat: Modify Devstack templates to include Debian/Ubuntu

Issue: RELENG-4765
Signed-off-by: Matthew Watkins <mwatkins@linuxfoundation.org>
Change-Id: I3dbd5152b32a79673d92d00fa022793cf3caecfb

23 months agoFix: Remove delta rpm deps for CentOS Appstream 8 57/71857/1
Anil Belur [Thu, 15 Jun 2023 22:41:37 +0000 (08:41 +1000)]
Fix: Remove delta rpm deps for CentOS Appstream 8

delta rpm is no longer available.

Issue: RELENG-4760
Change-Id: I172445e022fea08f20ef35f1802393ca8d01b722
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
23 months agoCI: Remove packer-validation temporarily 56/71856/1
Anil Belur [Thu, 15 Jun 2023 22:39:44 +0000 (08:39 +1000)]
CI: Remove packer-validation temporarily

The job needs to be re-designed for github
disable the job for voting until then.

Issue: RELENG-4761
Change-Id: Id9ba4e706f7802fb4cfd3770d977359e3052d0d4
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
23 months agoFeat: Add Openstack devstack template 28/71828/7 v0.13.0
Anil Belur [Tue, 13 Jun 2023 00:35:55 +0000 (10:35 +1000)]
Feat: Add Openstack devstack template

Move the Openstack devstack templates to build VM's with devstack
installed and ready for testing. ORAN community has requested devstack
images to be available on the CI env.

The templates and provision files have been tested to build the latest
version of the devstack yoga on the CI.

ZZCI - CentOS Stream 8 - devstack-yoga - x86_64 - 20230612-132235.763

Issue: RELENG-4760
Change-Id: I60d37d769158f34b22b84111fd5229c616232c27
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
23 months agoFix: prefix github.workspace 37/71837/3
Anil Belur [Wed, 14 Jun 2023 02:44:20 +0000 (12:44 +1000)]
Fix: prefix github.workspace

Issue: RELENG-4761
Change-Id: Iefb62656aa0d6ba4e5e4b69ae6b7c739e8184155
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
23 months agoFix: pre-fix $HOME before var and templates 36/71836/1
Anil Belur [Wed, 14 Jun 2023 01:09:03 +0000 (11:09 +1000)]
Fix: pre-fix $HOME before var and templates

Issue: RELENG-4761
Change-Id: Iae022ef868236ccaf3d84bb76f87cecf941395cd
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
23 months agoFix: Update packer validate script 35/71835/1
Anil Belur [Tue, 13 Jun 2023 23:12:27 +0000 (09:12 +1000)]
Fix: Update packer validate script

Issue: RELENG-4761
Change-Id: Idefc0a43c2f47aa6834fe7809911add73289c3de
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
23 months agoCI: Add GHA packer validation job 29/71829/1
Anil Belur [Tue, 13 Jun 2023 01:25:17 +0000 (11:25 +1000)]
CI: Add GHA packer validation job

Issue: RELENG-4761
Change-Id: I48283360f553d4c4f1fd902e8868f6d7a86a4bd7
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
2 years agoFix: Correct version label for GHA call 22/71622/1
Andrew Grimberg [Mon, 24 Apr 2023 18:12:26 +0000 (11:12 -0700)]
Fix: Correct version label for GHA call

Issue: RELENG-4563
Change-Id: Ib677bb53ac47e27501c668d9bd744d61bee9613e
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoFix: Correct bad actions call 85/71585/1
Andrew Grimberg [Tue, 18 Apr 2023 16:25:21 +0000 (09:25 -0700)]
Fix: Correct bad actions call

Issue: RELENG-4563
Change-Id: Ia368fed2b62d51bef3895b6f6cf9bd49042d6456
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoFix: Correct bad var def in release workflow 62/71562/1
Andrew Grimberg [Fri, 14 Apr 2023 16:27:41 +0000 (09:27 -0700)]
Fix: Correct bad var def in release workflow

Issue: RELENG-4563
Change-Id: Ifcd528f511410ed1b3363890e58e37903de3b32f
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoMerge "Chore: Update pre-commit hooks"
Jessica Wagantall [Thu, 13 Apr 2023 17:25:28 +0000 (17:25 +0000)]
Merge "Chore: Update pre-commit hooks"

2 years agoMerge "CI: Add GHA release workflow"
Jessica Wagantall [Thu, 13 Apr 2023 17:25:15 +0000 (17:25 +0000)]
Merge "CI: Add GHA release workflow"

2 years agoMerge "Refactor: Cleanup some pre-commit issues"
Jessica Wagantall [Thu, 13 Apr 2023 17:25:11 +0000 (17:25 +0000)]
Merge "Refactor: Cleanup some pre-commit issues"

2 years agoCI: Add GHA release workflow 58/71558/4
Andrew Grimberg [Thu, 13 Apr 2023 16:55:34 +0000 (09:55 -0700)]
CI: Add GHA release workflow

Issue: RELENG-45633
Change-Id: Id0ce3d3888047a11c3f674cf2c9ba8b06a64c690
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoChore: Update pre-commit hooks 59/71559/3
Andrew Grimberg [Thu, 13 Apr 2023 16:35:51 +0000 (09:35 -0700)]
Chore: Update pre-commit hooks

* github.com/pre-commit/pre-commit-hooks: v4.0.1 -> v4.4.0
* github.com/pre-commit/mirrors-prettier: v2.3.2 -> v3.0.0-alpha.6
* github.com/jorisroovers/gitlint: v0.15.1 -> v0.19.1
* github.com/jumanjihouse/pre-commit-hooks: 2.1.5 -> 3.0.0

Issue: RELENG-4563
Change-Id: Ie147b72b9e939ec57f4da56a9c2f220e2759fff2
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoRefactor: Cleanup some pre-commit issues 53/71553/4
Andrew Grimberg [Thu, 13 Apr 2023 14:08:19 +0000 (07:08 -0700)]
Refactor: Cleanup some pre-commit issues

* Cleanup some pre-commit issues
* Re-enable pre-commit as part of the default tox run
* Fix shellcheck error

Issue: RELENG-4563
Change-Id: I40b94b8dd2512118ebe0afcac556a42161cedbc8
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoCI: Docs tests require full repo history 56/71556/1
Andrew Grimberg [Thu, 13 Apr 2023 15:10:45 +0000 (08:10 -0700)]
CI: Docs tests require full repo history

Issue: RELENG-4563
Change-Id: Id3bcb21f1369c490e0dd35eccb35a488c27b2586
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoCI: Add GitHub Actions verify 54/71554/5
Andrew Grimberg [Thu, 13 Apr 2023 14:09:38 +0000 (07:09 -0700)]
CI: Add GitHub Actions verify

Issue: RELENG-4563
Change-Id: Ie1d605c40e0aa3e7a9db7fe3bcfde059b50070ba
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoDocs: Fix broken docs link 55/71555/2
Andrew Grimberg [Thu, 13 Apr 2023 14:43:40 +0000 (07:43 -0700)]
Docs: Fix broken docs link

Correct a docs link that should be using an ignored example domain

Issue: RELENG-4563
Change-Id: Id8dbf72c6cc55a46d30248738b57813fad08663f
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoFix: Skip ansible provisioners version check 54/70854/1 v0.12.1
Anil Belur [Thu, 13 Oct 2022 02:05:51 +0000 (12:05 +1000)]
Fix: Skip ansible provisioners version check

Packer provisioners invokes ansible version check which can be
skipped since the provisioner is invoking a custom script.

Issue-ID: RELENG-4473
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I661984bfc34857ff5ec42c63a695074f27e1492b

2 years agoFeat!: Install ansible tools from PyPI 25/70825/4 v0.12.0
Anil Belur [Thu, 6 Oct 2022 13:04:11 +0000 (23:04 +1000)]
Feat!: Install ansible tools from PyPI

Install ansible through system packages causes dependencies
conflicts on CentOS 8 platform therefore update packer
templates to use ansible provisioner created
through venv.

Error:
Problem: package ansible-5.4.0-3.el8.noarch requires
(ansible-core >= 2.12.2 with ansible-core < 2.13), but none
of the providers can be installed

Issue-ID: RELENG-4473
Change-Id: I1d562386b4408c9674271e813dcd2aea6632e709
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
2 years agoFix: Update Ubuntu installs on aarch64 63/70663/1 v0.11.1
Andrew Grimberg [Mon, 19 Sep 2022 19:40:44 +0000 (12:40 -0700)]
Fix: Update Ubuntu installs on aarch64

Do not change package mirror for aarch64 systems as this breaks since
most mirrors do not carry the packages

Change-Id: I800e83295bba8b55e9376fc735cd9f7b21fddf32
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoCI: Require RELENG changes in commit messages 15/70515/1
Andrew Grimberg [Wed, 17 Aug 2022 17:39:23 +0000 (10:39 -0700)]
CI: Require RELENG changes in commit messages

To make sure that JSD issues are not being referenced since that is not
public data, we will now start enforcing a requirement that commits have
a RELENG issue associated with them.

Issue: RELENG-4375
Change-Id: I37150383e0e986438fea01d549aa803f2f038100
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
2 years agoFeat: Upgrade git to v2.36 for CentOS7 78/70478/2 v0.11.0
Anil Belur [Wed, 10 Aug 2022 23:47:36 +0000 (09:47 +1000)]
Feat: Upgrade git to v2.36 for CentOS7

- v2.24 packages are no longer available on the CentOS mirrors.
  Disable warning to use yum module.
- Fix install python script to check python/python3 to test, since
  the default python3 is not available on CentOS7 platforms.
- Print the default version of python installed.

Issue-ID: IT-24376
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: Id48ad72aba776ed4092a292c4db1ad6459d9ab64
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
2 years agoFix: Import the correct gpg keys for sigul and EL8 22/70322/4 v0.10.2
Anil Belur [Fri, 24 Jun 2022 12:02:24 +0000 (22:02 +1000)]
Fix: Import the correct gpg keys for sigul and EL8

Sigul 1.1.1 is signed by the Fedora infrastructure key
therefore import the Fedora infra key before installing
the updated version on Sigul for CentOS8.

Import the EL8 GPG keys without which would fail
while installing several dependencies.

Issue-ID: IT-24054
Change-Id: I440b263ebb5f424496f21aa15e58bf7b34279f6e
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
2 years agoFix: Update doc refs to acumos 23/70323/3
Anil Belur [Fri, 24 Jun 2022 12:27:18 +0000 (22:27 +1000)]
Fix: Update doc refs to acumos

Acumos resources on the infra are decommissioned,
update the examples pointing to another project.

Change-Id: Ie3ea1892ed99d9ed7917c700fac35bf566a92c47
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
3 years agoFeat: Add support for CentOS Stream 9 58/70158/1
Anil Belur [Wed, 18 May 2022 06:53:32 +0000 (16:53 +1000)]
Feat: Add support for CentOS Stream 9

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: If80413b418a1783efbc5f5c81d315abd5c64cb07

3 years agoChore: Update Ubuntu/Centos base images 41/70041/3
Jessica Wagantall [Tue, 19 Apr 2022 21:08:28 +0000 (14:08 -0700)]
Chore: Update Ubuntu/Centos base images

Update RAW base images for Ubuntu 18.04, 20.04
and Centos 7

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I2de5f6fb3aa354b85821e317fb2ceca0ac3b5eb0

3 years agoCI: Disable pre-commit in CI 54/70054/1
Jessica Wagantall [Wed, 20 Apr 2022 19:22:41 +0000 (12:22 -0700)]
CI: Disable pre-commit in CI

Packer has been having issues creating new images for a bit and
pre-commit is no longer working in CI because of something upstream
because of this.

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I55cbfdb656294c980b1c499746404fc523202f1c

3 years agoFix: Install Sigul 1.1.1 for EL8 (CentOS Stream 8) 81/69981/1
Anil Belur [Mon, 11 Apr 2022 03:00:47 +0000 (13:00 +1000)]
Fix: Install Sigul 1.1.1 for EL8 (CentOS Stream 8)

Sigul requires python3-nss that is only available through
dnf module repo (pki-{core,deps}). These additional repo
need to be enabled for the Sigul to pull in the required
dependencies.

Note: `dnf module install|enable` is available through
Ansible playbooks, so use the command module instead.

Issue-ID: LF-JIRA IT-23826
Change-Id: Iff194240fc417ae92a2ea6caf0511c85cc973b41
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
3 years agoChore: Update to python38 54/69954/1
Anil Belur [Tue, 5 Apr 2022 02:33:34 +0000 (12:33 +1000)]
Chore: Update to python38

The provisioning script fails with errors while
trying to install python36 on CentOS8 image build.

python 3.6 is EOL, bump the install script to use python 3.8.

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I0431ee938c9da1c254e9ccc80c0e7d760bbde0ff

3 years agoFix: Use lowercase for CentOS Stream var file 41/69941/1 v0.10.1
Anil Belur [Fri, 1 Apr 2022 06:18:08 +0000 (16:18 +1000)]
Fix: Use lowercase for CentOS Stream var file

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I32edf055ce807fbcfc2b176fdfbd943256efa782

3 years agoFeat: Add support for CentOS Streams 8 92/69792/1 v0.10.0
Anil Belur [Thu, 3 Mar 2022 23:18:53 +0000 (09:18 +1000)]
Feat: Add support for CentOS Streams 8

Issue-ID: RELENG-4141
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I172aa7399e5f235082f058c7ab4690d83c5ad381

3 years agoChore: Update base images for Ubuntu 75/68975/1 v0.9.4
Jessica Wagantall [Thu, 14 Oct 2021 19:35:11 +0000 (12:35 -0700)]
Chore: Update base images for Ubuntu

Update base images for Ubuntu 18.04 and 20.04
ARM and x86

Issue: RELENG-4010
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I243b0547173afb79f38755c74dc4891a71b551ea

3 years agoChore: Update Ubuntu 18.04 68/68968/2
Jessica Wagantall [Tue, 12 Oct 2021 20:27:07 +0000 (13:27 -0700)]
Chore: Update Ubuntu 18.04

Update base image for Ubuntu 18.04

Issue: RELENG-3989
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I1821b6678745c89842936ced72e8cda06abf939b

3 years agoChore: Upgrade pre-commit hooks 81/68681/1 v0.9.3
Andrew Grimberg [Wed, 1 Sep 2021 18:20:39 +0000 (11:20 -0700)]
Chore: Upgrade pre-commit hooks

* github.com/pre-commit/pre-commit-hooks: v3.4.0 -> v4.0.1
* github.com/pre-commit/mirrors-prettier: v2.2.1 -> v2.3.2

Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Change-Id: I5499abc30a514568d7a4fe30f679d10c4fff5a22

3 years agoFix: Add missing Release Notes for latest packer 89/68589/2 v0.9.2
Jessica Wagantall [Thu, 19 Aug 2021 22:22:57 +0000 (15:22 -0700)]
Fix: Add missing Release Notes for latest packer

Add Release Notes for packer requirements changed
recently.

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: I459c7da09c3a5262e4093d98c763a21dd73df0b3

3 years agoFix: format of requirements.yaml 87/68587/1
quentinDERORY [Thu, 19 Aug 2021 21:51:16 +0000 (14:51 -0700)]
Fix: format of requirements.yaml

Signed-off-by: quentinDERORY <quentin.derory@ecole.ensicaen.fr>
Change-Id: Ibaef85987792566938a0ea7ef397148701c371ca

3 years agoChore: Add new galaxy requirement for magma project 78/68578/1
quentinDERORY [Wed, 18 Aug 2021 21:11:53 +0000 (14:11 -0700)]
Chore: Add new galaxy requirement for magma project

Signed-off-by: quentinDERORY <quentin.derory@ecole.ensicaen.fr>
Change-Id: I6a884a6d3c831222a095d1f75f958f1eed18c815

3 years agoFix: Use Vexx provided base images 34/68434/1
Jessica Wagantall [Wed, 4 Aug 2021 22:18:08 +0000 (15:18 -0700)]
Fix: Use Vexx provided base images

Use base images provided by Vexx instead of
LF's ones.

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: If2ecdf622235ae82211bd0051314713775676c23

3 years agoFix: Enable powertools repo for CentOS 8.* vers 39/68039/5 v0.9.1
Anil Belur [Thu, 17 Jun 2021 01:23:55 +0000 (11:23 +1000)]
Fix: Enable powertools repo for CentOS 8.* vers

The CR I43b943ddfc38faca does not work as expected since
ansible_facts does not match/return the minor versions of
the Repoid correctly.

For CentOS 8.2.2004 and earlier versions uses repoid as
'PowerTools' while CentOS 8.3.2011 and later versions uses repoid as
'powertools'. To handle this, check the repo file name under
/etc/yum.repos.d/ and enable the correct repository.

Ref: https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011\
Issue: RELENG-3710
Change-Id: Ib6a8d78664bbb5f20d2889fae3ae3b4238007141
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
3 years agoFix: AMI product codes need to be defined 56/67956/4 v0.9.0
Andrew Grimberg [Thu, 10 Jun 2021 20:05:27 +0000 (13:05 -0700)]
Fix: AMI product codes need to be defined

While trying to upgrade the internal Jenkins to latest global-jjb and
common-packer it's been found that all of our configurations for AWS
systems are missing vital filters.

The Ubuntu product codes were found by doing the following:

aws ec2 describe-images --region us-west-2 \
  --owners aws-marketplace --filters \
  "Name=architecture,Values=arm64" \
  "Name=name,Values=*ubuntu*20.04*" \
  "Name=manifest-location,Values=aws-marketplace/ubuntu/*"

This is per documentation found at
https://ubuntu.com/server/docs/cloud-images/amazon-ec2

Issue: RELENG-3757
Change-Id: I9391f6bec59318e00bc1b097c7a27181defeccff
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
3 years agoCI: Configure gitlint for Conventional Commits 58/67958/1
Andrew Grimberg [Thu, 10 Jun 2021 20:55:09 +0000 (13:55 -0700)]
CI: Configure gitlint for Conventional Commits

Turn on Conventional Commit message subject validation. This will affect
CI specifically, but developers can avoid having CI fail by assuring
that they have installed pre-commit and that they have also run

pre-commit install --hook-type commit-msg

The above is needed because pre-commit does not install commit-msg hooks
by default

Change-Id: I99779c6188ab2a4e57022a4ac552cbc3749accc2
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
3 years agoCI: Update pre-commit and make it work properly in CI 57/67957/1
Andrew Grimberg [Thu, 10 Jun 2021 20:53:56 +0000 (13:53 -0700)]
CI: Update pre-commit and make it work properly in CI

Change-Id: Idf2dbf580ca14af8a3c868a385658b4d51c4de9e
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
3 years agoFeat: Add support for Docker builder on Windows 07/67907/2
Anil Belur [Mon, 7 Jun 2021 22:23:47 +0000 (08:23 +1000)]
Feat: Add support for Docker builder on Windows

The original change e24c07369afd514abdf3efb0f596f772261412ed
missed updating Windows var files, while the builder templates were
updated. This breaks the packer verify jobs.

Error:
    required variable not set: docker_source_image'

Change-Id: Iac258a0ff132e12e00a49d9d02ce0f1806bef016
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
3 years agoFeat: Add support for Docker builder on arm64 78/67878/1
Anil Belur [Fri, 4 Jun 2021 02:50:17 +0000 (12:50 +1000)]
Feat: Add support for Docker builder on arm64

The original change e24c07369afd514abdf3efb0f596f772261412ed
missed updating arm64 var files and Ubuntu 20:04 var file,
while the builder template were updated. This breaks the
packer verify jobs.

Error:
* required variable not set: docker_source_image'

Issue: RELENG-3717
Change-Id: I1f3acf1479bf7a4ab271f747da5261ee2619e566
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
3 years agoFix: Change powertools repoid to lowercase 44/67844/4 v0.8.0
Anil Belur [Sat, 29 May 2021 03:47:14 +0000 (13:47 +1000)]
Fix: Change powertools repoid to lowercase

The repoids are renamed with CentOS 8.3 update breaks the packer
builds. Now the correct repoid to use is 'powertools' instead
of 'PowerTools'

Error: No matching repo to modify: PowerTools.

Ref:
https: //wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes
Issue: RELENG-3710
Change-Id: I43b943ddfc38facaa8c02f2d6ee98254e7ee3241
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoAdd docker-aws template 85/67485/1
Eric Ball [Tue, 20 Apr 2021 18:38:27 +0000 (11:38 -0700)]
Add docker-aws template

We now have at least one project on AWS that needs a docker template.

Issue: IT-21917
Change-Id: Ia08a1a32eb2ffaab46b1f01468018de688423852
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
4 years agoMerge "Use official CentOS & Ubuntu images via prodId"
Andrew Grimberg [Mon, 12 Apr 2021 16:06:58 +0000 (16:06 +0000)]
Merge "Use official CentOS & Ubuntu images via prodId"

4 years agoUse official CentOS & Ubuntu images via prodId 65/63865/2
Thanh Ha [Sat, 2 May 2020 02:20:16 +0000 (22:20 -0400)]
Use official CentOS & Ubuntu images via prodId

The previous filter method could result in getting an unexpected image
even one that's entirely different than what is intended. This patch
uses a product-code search of the marketplace for the official upstream
supported images rather than the custom ones provided by Amazon.

This patch is based on Zack William's suggestion on the lf-releng
mailinglist.

Reference:
https://lists.linuxfoundation.org/pipermail/lf-releng/2020-February/000135.html

Change-Id: Ia6208bd7a61036eb210d07533e3ceedbbc787678
Co-authored-by: Zack Williams <zdw@opennetworking.org>
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
4 years agoAdd support for a Docker builder 91/65091/6
Thanh Ha [Fri, 14 Aug 2020 14:23:29 +0000 (10:23 -0400)]
Add support for a Docker builder

Adding a Docker builder will allow us to more easily test build images
locally in a container before pushing a patch to production to build
the VMs themselves. While not guarenteed to be exactly the same it's
a close enough approximation that many issues can be caught before
patches are pushed.

Additionally this allows projects to also use the same packer templates
to build container based builder nodes if there's any projects using
Docker for their Jenkins jobs.

Issue: RELENG-1052
Change-Id: If89801cea16046900e7e880265ad859a96595fa1
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
4 years agoMerge "Update CentOS8 image" v0.7.7
Andrew Grimberg [Fri, 26 Mar 2021 14:59:43 +0000 (14:59 +0000)]
Merge "Update CentOS8 image"

4 years agoFixing netselect in install-python 37/67137/9
Bengt Thuree [Thu, 18 Mar 2021 11:24:37 +0000 (22:24 +1100)]
Fixing netselect in install-python

Actually use the result from netselect

Issue-ID: CIMAN-30

Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org>
Change-Id: I31b5858dc4b348f383f3b801b17c1aa8547296bd

4 years agoUpdate CentOS8 image 10/67110/1
Anil Belur [Wed, 17 Mar 2021 03:03:19 +0000 (13:03 +1000)]
Update CentOS8 image

Change-Id: If34cb35b7b54b7015e7c20a53c9ace9c10db5500
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoMerge "Migrate jobs from lf-standard-1 flavor to v3" v0.7.6
Anil Belur [Tue, 23 Feb 2021 08:00:51 +0000 (08:00 +0000)]
Merge "Migrate jobs from lf-standard-1 flavor to v3"

4 years agoUpdate shellcheck pre-commit hook to 2.1.5 09/66809/1 v0.7.5
Anil Belur [Thu, 18 Feb 2021 01:59:18 +0000 (11:59 +1000)]
Update shellcheck pre-commit hook to 2.1.5

With 2.1.5 release the workaround added in
d7d264e733e5 is no longer required.

Change-Id: I7e890d03844a2fb47159ad471f166310290fbf9f
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoMigrate jobs from lf-standard-1 flavor to v3 93/66793/2
Anil Belur [Tue, 16 Feb 2021 13:27:38 +0000 (23:27 +1000)]
Migrate jobs from lf-standard-1 flavor to v3

v3 flavors guarantees jobs spin on newer hardware that
are faster and cost-efficient than the v2 flavors.

Issue: RELENG-3329
Change-Id: I97f8d540f02fdccb3115bc624b167eb12464833b
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoAdd workaround to for shellcheck failure 94/66794/1
Anil Belur [Wed, 17 Feb 2021 00:21:12 +0000 (10:21 +1000)]
Add workaround to for shellcheck failure

The shellcheck hook breaks with the latest version of pre-commit (2.1.1)

[ERROR] The hook `shellcheck` specifies `additional_dependencies`
but is using language `script` which does not install an environment.

Ref:
https://github.com/jumanjihouse/pre-commit-hooks/pull/81

Change-Id: I19d8b26a7589d0bde7f1d3c6f768b738289ab937
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoRevert "Set packer builder type with env variable" 96/66596/1 v0.7.4
Anil Belur [Sat, 23 Jan 2021 01:45:35 +0000 (11:45 +1000)]
Revert "Set packer builder type with env variable"

This reverts commit cc035619ac1673a5b5ea2f6bfb843eac75ea4a9d.

Based on the input provided on the Gihub packer issue
hard-coded for our parser to be able to decode the rest of the config
properly."

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: If63b83eae7baa8ab6b30d8b9b187aa219ec2ba44

4 years agoRevert "Set packer builder type with env variable" 95/66595/1
Anil Belur [Sat, 23 Jan 2021 01:45:03 +0000 (11:45 +1000)]
Revert "Set packer builder type with env variable"

This reverts commit 8041971ef211709579f919bdeb9a77fef0a29433.

Based on the input provided on the Gihub packer issue
hard-coded for our parser to be able to decode the rest of the config
properly."

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I52ef1448fc53b2b9777786994683fbd705a1f8ba

4 years agoSet packer builder type with env variable 59/66559/1 v0.7.3
Anil Belur [Thu, 21 Jan 2021 08:32:12 +0000 (18:32 +1000)]
Set packer builder type with env variable

Using the -only CLI option for packer build does not work as
expected. The #CR 90dd675df482a8 (global-jjb) submitted with
common-packer v0.7.0 fails to build packer jobs because of a
bug in the packer build CLI.

The `-only` option packer build CLI does not set the cloud
provider name/type as per the documentation. The alternative
is to use an environment variable that is passed through the
packer job and can be reference in the packer templates.

The CR cc035619ac16 missed including the changes to the other
templates.

Issue: https://github.com/hashicorp/packer/issues/10495
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: I14976aa77312a3d887d30b7d6e2cc32ab8073b72

4 years agoSet packer builder type with env variable 28/66528/3 v0.7.2
Anil Belur [Sat, 16 Jan 2021 05:11:31 +0000 (15:11 +1000)]
Set packer builder type with env variable

Using the -only CLI option for packer build does not work as
expected. The #CR 90dd675df482a8 (global-jjb) submitted with
common-packer v0.7.0 fails to build packer jobs because of a
bug in the packer build CLI.

The `-only` option packer build CLI does not set the cloud
provider name/type as per the documentation. The alternative
is to use an environment variable that is passed through the
packer job and can be reference in the packer templates.

Issue: https://github.com/hashicorp/packer/issues/10495
Change-Id: I1c1e2e7c5545df5a2a374a02714634a0f4086378
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoRemove openstack AZ from templates 73/66373/4 v0.7.1
Eric Ball [Tue, 29 Dec 2020 20:06:23 +0000 (12:06 -0800)]
Remove openstack AZ from templates

The availability zone started causing issues with packer builds. Per
Vexxhost help, there is only one AZ, and removing this line
alleviates the issue.

Issue: RELENG-3344
Change-Id: Icf60fe527ae328d7883ef38c3efba9972d2f2669
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
4 years agoUpdate prettier URL for pre-commit 74/66374/2
Eric Ball [Tue, 29 Dec 2020 20:22:21 +0000 (12:22 -0800)]
Update prettier URL for pre-commit

Issue: RELENG-3344
Change-Id: I07daf63bcb03252367b11a64f44c938bf807eea6
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
4 years agoMerge "Workflow for updating images."
Aric Gardner [Mon, 31 Aug 2020 18:33:59 +0000 (18:33 +0000)]
Merge "Workflow for updating images."

4 years agoWorkflow for updating images. 81/61681/15
Aric Gardner [Tue, 10 Sep 2019 19:08:20 +0000 (15:08 -0400)]
Workflow for updating images.

documenation on:
"Update Packer Base Image"
and
"Update Packer Images to reflect changes
in LF ansible galaxy roles"

ISSUE: RELENG-2363
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: Ia2bac9c336772742bf58058114b1668498cfcbd3

4 years agoAdd Ubuntu 20.04 arm64 image 37/65137/1 v0.7.0
Anil Belur [Wed, 19 Aug 2020 04:55:20 +0000 (14:55 +1000)]
Add Ubuntu 20.04 arm64 image

Issue: JSD IT-20435
Change-Id: I5f21934ec15754892d3ebea826965167edb84601
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoAdd Ubuntu 20.04 amd64 image 36/65136/1
Anil Belur [Wed, 19 Aug 2020 04:50:38 +0000 (14:50 +1000)]
Add Ubuntu 20.04 amd64 image

Issue: JSD IT-20435
Change-Id: Iec986b683fe168c417c40c0815d743d28c288dd6
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoMerge "Add support for Ubuntu 20.04 and newer"
Andrew Grimberg [Tue, 18 Aug 2020 17:13:24 +0000 (17:13 +0000)]
Merge "Add support for Ubuntu 20.04 and newer"

4 years agoEnsure sudo is installed as Ansible requirement 94/65094/1
Thanh Ha [Fri, 14 Aug 2020 14:44:14 +0000 (10:44 -0400)]
Ensure sudo is installed as Ansible requirement

Ansible requires sudo to be available and Docker images do not
typically come with sudo pre-installed so add code to ensure it
get's pulled in.

Issue: RELENG-1052
Change-Id: I8e67f7048f2199f208c7596cb7b7c6182e61ed51
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
4 years agoRename vexxhost to openstack for builder names 90/65090/2
Thanh Ha [Fri, 14 Aug 2020 14:15:42 +0000 (10:15 -0400)]
Rename vexxhost to openstack for builder names

Considering the AWS builders are named AWS after the service let's
rename the vexxhost ones to openstack. As far as I am aware we are
not supporting multiple providers with the same backend at the same
time so this will make things consistent.

When we later add docker support it will just be called "docker" as
well.

Issue: RELENG-1052
Change-Id: I8f46d544961e508cdeee28d4e761c2feae5e744e
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
4 years agoAdd support for Ubuntu 20.04 and newer 83/65083/1
Thanh Ha [Thu, 13 Aug 2020 22:17:38 +0000 (18:17 -0400)]
Add support for Ubuntu 20.04 and newer

Ubuntu 20.04 no longer has python-* packages and instead the packages
are now more explicitly either python2-* or python3-* with packages
named python-is-python[23] to set the default. This patch when run
on Ubuntu systems will check if python-is-python3 is available and
installs that as the system python version, otherwise installs
python-minimal.

Also adjust the comments since they are no longer accurate or in the
right places.

Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: I830e0250ddbee395fdeddd78fcc7824f7855d75d

4 years agoUpdate Ubuntu 18.04 base image 15/64815/1 v0.6.2
Aric Gardner [Thu, 30 Jul 2020 03:10:00 +0000 (13:10 +1000)]
Update Ubuntu 18.04 base image

Change-Id: I4b40ff1c84cfa2f64235b3a8132e6d43baea1f3a
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoUpdate Ubuntu base image to 2020-07-28 snapshot 97/64797/4 v0.6.1
Aric Gardner [Tue, 28 Jul 2020 19:22:24 +0000 (15:22 -0400)]
Update Ubuntu base image to 2020-07-28 snapshot

base image was uploaded in qcow2 format.
this casued timeout in packer builds.
new image is in raw format.

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: I0151e6b8677625e4477d93faa67cb1abdf84515c

4 years agoAdd release notes for sigul client on CentOS 7 21/64621/1 v0.6.0
Eric Ball [Thu, 23 Jul 2020 18:48:55 +0000 (11:48 -0700)]
Add release notes for sigul client on CentOS 7

Issue: RELENG-3077
Change-Id: I3314b0770a0f0280ee162bbb646f95312cff6196
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
4 years agoAdd install of Sigul client on CentOS 7 10/64610/1
Eric Ball [Thu, 23 Jul 2020 01:27:12 +0000 (18:27 -0700)]
Add install of Sigul client on CentOS 7

Our current signing scripts download and install Sigul only when
executing the signing scripts. However, the servers hosting this
package are not reliable, and we should see significant performance
improvements by having the package pre-loaded on CentOS 7 builders
(the only builders capable of using Sigul).

Issue: RELENG-3077
Change-Id: I35ac34a3619f4018331f280745f4ff3d5c864fa9
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
4 years agoUpdate the CentOS 7 base image to the latest 77/64277/2
Anil Belur [Tue, 16 Jun 2020 00:37:09 +0000 (10:37 +1000)]
Update the CentOS 7 base image to the latest

https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-2003.raw.tar.gz

Issue: IT-19958
Change-Id: Ib6f84fc36d6644c286540abd11c8446bea78497f
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
4 years agoFix provisioner to install Git 2 from IUS 61/64261/2 v0.5.2
Thanh Ha [Fri, 12 Jun 2020 00:37:12 +0000 (20:37 -0400)]
Fix provisioner to install Git 2 from IUS

While patch Ibace4cdf89d0615a2e5117f9ea3ca50730d5c93d fixed the setup
for the IUS repo. It failed to ensure that Git 2 is installed from the
IUS repo.

In the refactored IUS repo git2u no longer exists and instead the
latest Git package appears to be git224 so let's update to that
version.

Also class cast ansible_distribution_major_version|int as this variable
normally returns a type AnsibleUnsafeText which cannot be compared to
an int type.

Change-Id: I1cd815fb0440be996ba66c3a48eab9d6da02f4bb
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
4 years agoMerge "Run docs and docs-linkcheck in verify"
Andrew Grimberg [Sat, 6 Jun 2020 14:32:43 +0000 (14:32 +0000)]
Merge "Run docs and docs-linkcheck in verify"

4 years agoMerge "Add .editorconfig file"
Andrew Grimberg [Sat, 6 Jun 2020 14:26:48 +0000 (14:26 +0000)]
Merge "Add .editorconfig file"

4 years agoMerge "Print git-diff when pre-commit fails"
Andrew Grimberg [Sat, 6 Jun 2020 14:25:54 +0000 (14:25 +0000)]
Merge "Print git-diff when pre-commit fails"

4 years agoRun docs and docs-linkcheck in verify 30/64230/1
Thanh Ha [Sat, 6 Jun 2020 14:21:06 +0000 (10:21 -0400)]
Run docs and docs-linkcheck in verify

Not sure why we weren't running docs build tests as part of the
common-packer verify build but this patch updates tox to enable
those build tests.

Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: I7d28bdf8ace6946bcf1b6a2d08bc1408875fce96

4 years agoAdd .editorconfig file 25/64225/1
Thanh Ha [Sat, 6 Jun 2020 14:04:39 +0000 (10:04 -0400)]
Add .editorconfig file

EditorConfig is a universal editor configuration file supported by many
IDEs and Editors (although some might require installing a plugin) to
share consistent editor configuration with developers using different
editors.

Ref: https://editorconfig.org/
Change-Id: I59a4a57298e295dcfe7d21591a8c0fb501b0cef6
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
4 years agoPrint git-diff when pre-commit fails 24/64224/1
Thanh Ha [Sat, 6 Jun 2020 14:01:53 +0000 (10:01 -0400)]
Print git-diff when pre-commit fails

When pre-commit fails and automatically fixes issues for us in Jenkins
we are not able to see what pre-commit automatically fixed. Adding
--show-diff-on-failure makes pre-commit perform a git-diff immediately
after failing to ensure more useful output is printed to inform the
contributor what changes are needed to pass the check.

Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: Ic2ad49fd6222bee0341c4826e6ccc463d05fda5f

4 years agoUpdate pre-commit hooks 2020-06 23/64223/1
Thanh Ha [Sat, 6 Jun 2020 14:00:27 +0000 (10:00 -0400)]
Update pre-commit hooks 2020-06

It's been awhile since we last updated the pre-commit hooks so let's
catch up with the world.

Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: Ibf5e945a2bb6324c73ea5b2d7a683bc0f926384b

5 years agoFix PowerTools enablement and IUS install 42/64042/1 v0.5.1
Andrew Grimberg [Wed, 20 May 2020 20:08:50 +0000 (13:08 -0700)]
Fix PowerTools enablement and IUS install

* Use correct syntax for verifying the major version(s) we
  should be setting IUS up on
* Fix the fact we're checking to know if should be enabling
  the PowerTools repo

Change-Id: I3340d5aae147a2c5881d973442fba4e9543d8c1e
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
5 years agoFix version comparison for PowerTools installation 05/63705/1
Andrew Grimberg [Fri, 17 Apr 2020 21:42:42 +0000 (14:42 -0700)]
Fix version comparison for PowerTools installation

Apparently ansible_distribution_major_version returns a string and
cannot therefore properly be tested in an integer based test. Use the
version() function instead.

https://docs.ansible.com/ansible/latest/user_guide/playbooks_tests.html#version-comparison

Change-Id: I7abb42f94b1543aed5fe3ca548184ac1082612d7
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
5 years agoSupport CentOS 8 builds 31/63531/3 v0.5.0
Andrew Grimberg [Fri, 27 Mar 2020 22:14:36 +0000 (15:14 -0700)]
Support CentOS 8 builds

Changes needed to run the packer against CentOS 8 systems

Issue: RELENG-2823
Change-Id: I7748d98150630bc5327d407eab5421a2ec21e7bf
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
5 years agoAdd Centos 8 base image 00/63500/2
Lott, Christopher (cl778h) [Wed, 25 Mar 2020 15:06:45 +0000 (11:06 -0400)]
Add Centos 8 base image

Issue-ID: RELENG-2823
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: I6c00ef45e269028f60a06f7f4aa9c38729ad952a

5 years agoUpdate ARM base images 32/63432/1
Jessica Wagantall [Tue, 17 Mar 2020 20:20:04 +0000 (13:20 -0700)]
Update ARM base images

Update the latest (tested) baseimages for ARM
Ubuntu 16.40 and Ubuntu 18.04

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: Ide6115ef7f9d3e42935011aaf37872adc759e589

5 years agoInstall netselect depending on the Ubuntu arch 47/63147/12 v0.4.4
Bengt Thuree [Wed, 19 Feb 2020 01:01:27 +0000 (12:01 +1100)]
Install netselect depending on the Ubuntu arch

Change-Id: Ie93b7b5d510ff1e067db4fcfc1020f9ae93dadcf
Signed-off-by: Bengt Thuree <bthuree@linuxfoundation.org>
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
5 years agoAllow the jenkins user to sudo as any user 25/63125/1
Thanh Ha [Fri, 14 Feb 2020 03:12:17 +0000 (22:12 -0500)]
Allow the jenkins user to sudo as any user

Previously the Jenkins user could only sudo and run commands as root.
This change allows the Jenkins user to `sudo -u another_user` without
providing a password. This is useful for test suites that need to
perform commands as different user accounts and not just root.

Change-Id: Ib7864e8b9370ae7f1a2a8bec82cf609e7dcccead
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
5 years agoMinor Cleanup 97/62997/1
Tim Johnson [Thu, 30 Jan 2020 16:12:45 +0000 (08:12 -0800)]
Minor Cleanup

Change-Id: Ia826901dbbc1a3fd6f5df4af22418015b9dbc78c
Signed-off-by: Tim Johnson <tijohnson@linuxfoundation.org>
5 years agoDo not fail the build when a mirror is not found 81/62981/1 v0.4.3
Anil Belur [Wed, 29 Jan 2020 10:09:38 +0000 (20:09 +1000)]
Do not fail the build when a mirror is not found

Forgot to include this check in the change 4c9db8e41b3b546a52.
netselect checks for the mirrors from the list and when one
or more mirrors are not available returns the below error
causing the build to fail.

error:
netselect: unknown host gpl.savoirfairelinux.net/pub/mirrors/ubuntu/

Issue: RELENG-2642
Change-Id: I4351a40be996092febe4efe956b18a9a575c994e
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
5 years agoMerge "Use netselect to choose a package mirror" v0.4.2
Anil Belur [Wed, 29 Jan 2020 01:27:01 +0000 (01:27 +0000)]
Merge "Use netselect to choose a package mirror"

5 years agoMerge "Revert "Use apt-get to install python-minimal""
Anil Belur [Wed, 29 Jan 2020 01:26:42 +0000 (01:26 +0000)]
Merge "Revert "Use apt-get to install python-minimal""

5 years agoAdd GitLint which replaces GitCommitBear 76/62976/2
Thanh Ha [Tue, 28 Jan 2020 15:39:05 +0000 (10:39 -0500)]
Add GitLint which replaces GitCommitBear

The GitCommitBear was removed via
I8d782822ca87add9108a044fd6e19b1c23686717 this replaces it with
GitLint which does similar linting for git commit messages.

Issue: RELENG-2642
Signed-off-by: Thanh Ha <zxiiro@gmail.com>
Change-Id: I6e47db45a6c5c519ee795adf15c4243fb0bfb6dd