Skip to content

Removes redundant test invocation and prepares for new Docker images#389

Merged
codefromthecrypt merged 1 commit intomasterfrom
dedupe-gha
Oct 6, 2021
Merged

Removes redundant test invocation and prepares for new Docker images#389
codefromthecrypt merged 1 commit intomasterfrom
dedupe-gha

Conversation

@codefromthecrypt
Copy link
Copy Markdown
Contributor

@codefromthecrypt codefromthecrypt commented Oct 6, 2021

This prepares for #387 by looking up the homedir of the docker user
dynamically. This also deduplicates double-testing with timezone as
that's a very heavy way to avoid bugs.

Signed-off-by: Adrian Cole <adrian@tetrate.io>
@codefromthecrypt codefromthecrypt changed the title Deduplicated runner configuration and prepares for new Docker images Removes redundant test invocation and prepares for new Docker images Oct 6, 2021
Copy link
Copy Markdown
Contributor Author

@codefromthecrypt codefromthecrypt left a comment

Choose a reason for hiding this comment

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

notes

docker run --rm -v $HOME/.func-e:${DOCKER_HOME}/.func-e -v $PWD:/work -w /work --entrypoint /usr/bin/make ${CENTOS_IMAGE} -o ${E2E_FUNC_E_PATH}/func-e e2e
env: # CENTOS_IMAGE was built by internal-images.yaml; E2E_FUNC_E_PATH was built via `make build`
CENTOS_IMAGE: ghcr.io/tetratelabs/func-e-internal:centos8
E2E_FUNC_E_PATH: build/func-e_linux_amd64/func-e
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

bug as PATH is the path to func-e

if: runner.os == 'Linux'
run: docker run -v $HOME/.func-e:/root/.func-e -v $PWD:/func-e --rm ${CENTOS_IMAGE} -c "cd /func-e; make -o ${E2E_FUNC_E_PATH} e2e"
run: | # TODO: clean this up after #387 as DOCKER_HOME, workdir and entrypoint will be correct by default
DOCKER_HOME=$(docker run --rm --entrypoint /bin/bash ${CENTOS_IMAGE} -c 'echo $HOME')
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

this line and a bunch of the overriding below go away with the new images, but this syntax will work with both old and new

@codefromthecrypt codefromthecrypt marked this pull request as ready for review October 6, 2021 23:02
@codefromthecrypt codefromthecrypt merged commit 6eb86f4 into master Oct 6, 2021
@codefromthecrypt codefromthecrypt deleted the dedupe-gha branch October 6, 2021 23:08
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.

1 participant