(PA-4872) openssl 3 solaris 11 x86

[cthorn42]

No description provided.

[joshcooper]

This needs rebasing due to merge conflicts.

[joshcooper]

ah it looks like there's a merge commit in the feature branch. Could you instead rebase these commits onto upstream/master like

git reset --hard 52bfb2b               
git rebase 099a647 --onto upstream/master

You'll get some conflicts which need to be resolved, then

git rebase --continue
git push -f origin HEAD

The reason for going through this trouble is merge commits in pull requests make it difficult to understand git history. So the rebase workflow is preferred.

[cthorn42]

Thanks for the help Josh, greatly appreciated.

[joshcooper]

Looks good. If you haven't already, could you vanagon-generic-build these project & platform combinations:

❯ bx rake vanagon:component_diff -- -P agent-runtime-7.x -p all --from 46c127e --to HEAD  | grep 'Platform name'
Platform name: solaris-11-i386

❯ bx rake vanagon:component_diff -- -P agent-runtime-main -p all --from 46c127e --to HEAD  | grep 'Platform name' | grep -v solaris-10
Platform name: solaris-11-sparc
Platform name: solaris-11-i386

We can ignore solaris 10 on agent-runtime-main

[cthorn42]

Here is the solaris-11-i386 for agent-runtime-7.x: https://jenkins-platform.delivery.puppetlabs.net/view/vanagon-generic-builder/job/platform_vanagon-generic-builder_vanagon-packaging_generic-builder/2118/BUILD_TARGET=solaris-11-i386,SLAVE_LABEL=k8s-worker/
and here is the agent-runtime-main job: https://jenkins-platform.delivery.puppetlabs.net/view/vanagon-generic-builder/job/platform_vanagon-generic-builder_vanagon-packaging_generic-builder/2116/
The i386 cell failed with the rubygems-ffi failure that is ticketed, and the sparc cell failed. I guess that should be suspected since we haven't landed any changes for that yet?

[joshcooper]

Thanks for running those. I'm not concerned about the solaris 11 sparc failures in agent-runtime-main