Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI-1488: Upgrade draupnir to use pg-14 #446

Merged
merged 25 commits into from
Jul 21, 2022
Merged

Conversation

DragosDumitrache
Copy link
Contributor

@DragosDumitrache DragosDumitrache commented Jul 15, 2022

Actual footage of this work

This started out as a bit of a red herring, trying to get the vagrant file working. Ended up not doing so, and focused on getting the integration tests working locally.

A quick rundown of what's changed:

  • updated Ruby (3.1.2) and Go (1.17) versions to ones that support M1s
  • updated Ubuntu to 22.04
  • updated the gem locks and the version of pq such that draupnir can interact with the newer postgres
  • updated postgres from 11 to 14 in the dockerfile and the corresponding scripts, i.e. provision.sh and all the draupnir scripts
  • remove mention of deb from the readme, and deb files, as we have transitioned to go mod in 2020.
  • With @Nabil372's help, updated the db.tar following the same instructions from here

@lawrencejones
Copy link
Contributor

I've been enjoying these PRs, thanks for the entertainment!

@DragosDumitrache
Copy link
Contributor Author

@lawrencejones feel free to join our next treasure hunt, should be an in-person one :trollface:

Copy link

@JoeSouthan JoeSouthan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems good, just one thing

.circleci/Dockerfile Show resolved Hide resolved
Copy link

@kevinrobayna kevinrobayna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM We did something similar on frontier and payments-svc. Knowing that vagrant files and docker files are almost a copy of each other i think we can merge this!

Theo Barber-Bany and others added 12 commits July 19, 2022 15:59
It's a squashed commit that has ended up being reverted, as things
never seemed to work fully. Has been kept in for the time being as
some of the subsequent commits involved changes to files modified by
these commits.

Below is a view on the changes introduced by these commits:

New vargantfile for M1

This might work, might not. Who knows :)

more stuff trying random things

maybe it'll work - looks like we were using go 1.10, but go.mod requires
1.14, so let's use that and see...

Updating config

to use a newer go and attempt to install btrfs

Final attempt at using qemu as a vagrant provider

Currently failing to mount the btfrs volume

Undo changes to vagrant file
Debugging failing tests in the running container.
Installing postgres 14

WIP getting integration tests passing

Current thinking is, the db.tar file was created from pg11
Update all uses of postgres to use postgres 14
Update go to 1.17 and ruby to 2.7.2
Update go pq dependency
Remove mentions of dep from readme
Remove comment for provision.sh start lines
Undo line break in create-instance
This fixes all integration tests
Update integration test task to build the dockerfile locally, so we
always use the latest, local changes
Trying to use a more modern openssl

No longer install ruby manually

install it in docker directly

Update ruby to 3.0.2

Update ruby version

and readme

Update draupnir version and changelog

Update go and ruby images

One to use the maintainted circleci image for Golang, and the ruby one
to match the necessary ruby version
@nlopes
Copy link
Contributor

nlopes commented Jul 19, 2022

Big fan of draupnir. Would love to see this merged! 👀

.circleci/config.yml Outdated Show resolved Hide resolved
vagrant/provision.sh Outdated Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
ddumitrache and others added 5 commits July 21, 2022 16:40
Update certificate to use -extfile instead of -addext
Use the right volume for the SATA controller
Use `go install`, as per newer golang guidance, and pin a version so
that we don't end up with nasty surprises.
Copy link
Contributor

@benwh benwh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - works locally so happy to get this merged in

@DragosDumitrache DragosDumitrache merged commit 2428065 into master Jul 21, 2022
@DragosDumitrache DragosDumitrache deleted the update-to-pg-14 branch July 21, 2022 16:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants