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

Add integration ci for Monit #1286

Merged
merged 2 commits into from
Nov 15, 2023
Merged

Conversation

samuel40791765
Copy link
Contributor

Issues:

Resolves CryptoAlg-2167

Description of changes:

Adding an integration CI for our recent support for Monit.

Call-outs:

N/A

Testing:

New CI dimension, time tests will fail on a non-CET timezone machine, so I removed the test. It's non-relevant to AWS-LC functionality.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@samuel40791765 samuel40791765 requested a review from a team as a code owner November 6, 2023 22:40
Copy link
Contributor

@andrewhop andrewhop left a comment

Choose a reason for hiding this comment

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

Looking at the build output is this line expected:

Compiler flags: -g -O2 -Wextra -fstack-protector-all -D_GNU_SOURCE -Wall -Wunused  -std=c11 -D _REENTRANT -I/codebuild/output/src164812706/src/github.com/aws/aws-lc/MONIT_BUILD_ROOT/aws-lc-install/include -I/codebuild/output/src164812706/src/github.com/aws/aws-lc/MONIT_BUILD_ROOT/aws-lc-install/include

Specifically passing in the include directory twice, and here:

Linker flags: -lpam -lz -lpthread -lcrypt -lresolv -lnsl  /codebuild/output/src164812706/src/github.com/aws/aws-lc/MONIT_BUILD_ROOT/aws-lc-install/lib/libssl.a /codebuild/output/src164812706/src/github.com/aws/aws-lc/MONIT_BUILD_ROOT/aws-lc-install/lib/libcrypto.a -L/codebuild/output/src164812706/src/github.com/aws/aws-lc/MONIT_BUILD_ROOT/aws-lc-install/lib

Specifically why is it passing the entire path to our libcrypto.a which should tell the linker to link the libcrypto.a and passing in -L/path/to/aws-lc/folder.

Is this just an issue with their makefile, or how we're building it?

tests/ci/integration/run_monit_integration.sh Show resolved Hide resolved
tests/ci/integration/run_monit_integration.sh Outdated Show resolved Hide resolved
Copy link
Contributor Author

@samuel40791765 samuel40791765 left a comment

Choose a reason for hiding this comment

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

Great attentional to detail. For both issues, I think it's due to their make file configurations.
For the redundant include and linker flag, the first one seems to defined here when --with-ssl-static is used. The second flag is being added here again since with_sslstatic is true.

https://bitbucket.org/tildeslash/monit/src/def6b462259586358be3c86d76a299c80744df39/configure.ac#lines-766:774

tests/ci/integration/run_monit_integration.sh Outdated Show resolved Hide resolved
@justsmth justsmth self-requested a review November 7, 2023 18:28
Comment on lines +33 to +34
# TimeTest will fail on a machine not in CET timezone.
# https://bitbucket.org/tildeslash/monit/src/def6b462259586358be3c86d76a299c80744df39/libmonit/test/TimeTest.c#lines-24
Copy link
Contributor

Choose a reason for hiding this comment

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

is there anything important in TimeTest? if so, is it worth configuring this box to be in CET tz within this script?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not anything relevant to AWS-LC, they're time function tests to verify things are parsed correctly: https://bitbucket.org/tildeslash/monit/src/master/libmonit/test/TimeTest.c

@samuel40791765 samuel40791765 merged commit 0b0c6b1 into aws:main Nov 15, 2023
12 checks passed
@samuel40791765 samuel40791765 deleted the monit-ci branch November 15, 2023 19:43
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.

3 participants