Skip to content

Allow testcases to run on s390x architecture#7676

Merged
caseydavenport merged 2 commits intoprojectcalico:masterfrom
linux-on-ibm-z:patch-s390x-calico
Oct 3, 2023
Merged

Allow testcases to run on s390x architecture#7676
caseydavenport merged 2 commits intoprojectcalico:masterfrom
linux-on-ibm-z:patch-s390x-calico

Conversation

@rposts
Copy link
Contributor

@rposts rposts commented May 18, 2023

Description

This PR attempts to address following issues observed on s390x arch - In particular:
o Calicoctl component replaces “amd64” with ARCH to make is applicable to “s390x” – I have used ARCH here making it consistent with earlier uses of ARCHs in the Makefile
o Felix testcase removes hardcoded “amd64” declaration with Go runtime built-in
o Confd corrects ARCH linking for s390x
o Kube-controller Dockerfile is changed to produce working version of the image (also brings it closer to amd64)
o Node/calico_test Dockerfile is changed to produce working version of the image (also brings it closer to amd64)

Related issues/PRs

This issue #7654 should clarify the status of calico/bpftool:v5.3-s390x image
This PR projectcalico/toolchain#442 enhances calico/go-build image for s390x which will be needed to build and run testcases on s390x arch

Todos

  • Tests
  • Documentation
  • Release note

Release Note

TBD

Reminder for the reviewer

Make sure that this PR has the correct labels and milestone set.

Every PR needs one docs-* label.

  • docs-pr-required: This change requires a change to the documentation that has not been completed yet.
  • docs-completed: This change has all necessary documentation completed.
  • docs-not-required: This change has no user-facing impact and requires no docs.

Every PR needs one release-note-* label.

  • release-note-required: This PR has user-facing changes. Most PRs should have this label.
  • release-note-not-required: This PR has no user-facing changes.

Other optional labels:

  • cherry-pick-candidate: This PR should be cherry-picked to an earlier release. For bug fixes only.
  • needs-operator-pr: This PR is related to install and requires a corresponding change to the operator.

@rposts rposts requested a review from a team as a code owner May 18, 2023 14:15
@marvin-tigera marvin-tigera added this to the Calico v3.27.0 milestone May 18, 2023
@marvin-tigera marvin-tigera added release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels May 18, 2023
@rposts
Copy link
Contributor Author

rposts commented Jun 28, 2023

@marvin-tigera Please let me know how we can proceed with this PR - Thanks!

@caseydavenport
Copy link
Member

/sem-approve

@caseydavenport
Copy link
Member

Sorry for the delay! Running CI, and LGTM

@caseydavenport caseydavenport added docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact merge-when-ready labels Jul 12, 2023
@marvin-tigera marvin-tigera removed release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Jul 12, 2023
@marvin-tigera
Copy link
Contributor

Removing "merge-when-ready" label due to new commits

@caseydavenport
Copy link
Member

caseydavenport commented Sep 27, 2023

@rposts sorry for yet another delay - I was coming to merge this now, but it looks like there are some conflicts that need to be resolved first.

I think this one has been here for a while, so let me know if you'd rather I resolve them myself and submit a new PR on top of your commits.

@rposts
Copy link
Contributor Author

rposts commented Sep 28, 2023

Hi @caseydavenport - sure, if it makes things easier for you then go ahead with resolving them yourself. I am here for any s390x problems encountered. Also note that there are couple of inter-reflated Related issues/PRs in the section above that will be required to make it more complete.

Thanks for all your help!

@caseydavenport caseydavenport mentioned this pull request Oct 2, 2023
3 tasks
@caseydavenport caseydavenport merged commit 5a81a3a into projectcalico:master Oct 3, 2023
@caseydavenport
Copy link
Member

Merged it here: #8073

I haven't been able to actually run it on s390x, so if you find any issues with it please open any follow on PRs we need!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants