Back port Jenkinsfile and associated changes to generator/build (3.21) - #3494
Merged
Conversation
|
Thank you for submitting a pull request! Maybe @nickanderson can review this? |
Contributor
Author
|
almost done here, just need to double-check and squash commits :) |
nickanderson
approved these changes
Aug 26, 2025
| USER jenkins | ||
| WORKDIR /home/jenkins | ||
| RUN bash -x /install.sh | ||
| RUN bash -x /install.sh 2>&1 | tee /install.sh.log |
| fi | ||
|
|
||
| echo "$(basename "$0"): Diagnostic facts about execution environment:" | ||
| echo "======" |
| else | ||
| _VERSION="$BRANCH" # in case someone copy/pastes this to a repo besides documentation | ||
| fi | ||
| cf-remote --version "$_VERSION" download "${ID}$(echo "${VERSION_ID}" | cut -d. -f1)" hub "$(uname -m)" |
| find "$HOME/.cfengine" -name '*.deb' -print0 | xargs -0 -I{} cp {} cfengine-nova-hub.deb | ||
| else | ||
| echo "Installing with old-style fetch_file function" | ||
| HUB_DIR_NAME=PACKAGES_HUB_x86_64_linux_ubuntu_22 |
Member
There was a problem hiding this comment.
Should ubuntu and 22 here come from os_release vars?
Contributor
Author
There was a problem hiding this comment.
well, this part is the as-is/as-was portion so left the same. It could.
|
|
||
| # unpack | ||
| # we unpack the hub package instead of installing to get around trouble with the package trying to start up services in a container which doesn't work all that well (yet, 2025) | ||
| sudo dpkg --unpack cfengine-nova-hub.deb |
| sudo dpkg --unpack cfengine-nova-hub.deb | ||
| rm cfengine-nova-hub.deb | ||
|
|
||
| # TODO: why copy the masterfiles from the package over the top of one we checked out which could have changes from a PR? |
Member
There was a problem hiding this comment.
Yeah, that wouldn't seem to make sense.
| # These env vars must be defined: | ||
| true "${BRANCH?undefined}" | ||
| # The PACKAGE* vars are not needed for fast-build jobs as they use cf-remote --version $BRANCH install | ||
| # We still require them to have a value but by current convention (until cf-remote --version testing-pr-build-number works) we set them to cf-remote in documentation/Jenkinsfile |
| c=$(buildah from -v "$PWD":/nt docs-revamp-22) | ||
| # figure out BRANCH from jenkins environment variables | ||
| if [ -n "$PR_BASE" ]; then | ||
| # PR_BASE comes from documentation/Jenkinsfile and ${pullRequest.base} |
| BRANCH="$PR_BASE" | ||
| elif [ -n "$BRANCH_NAME" ]; then | ||
| # jenkins, for pull requests this will be e.g. PR-<number> so not used | ||
| # for non-pull reqeusts this will be master, 3.24.x, etc |
Some diffs are present between master (hugo) and 3.21/3.24 (jekyll still). Ticket: ENT-12581 Changelog: none
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ticket: ENT-12581
Changelog: none