Skip to content

Conversation

lukedirtwalker
Copy link
Collaborator

@lukedirtwalker lukedirtwalker commented Jan 21, 2020

Re-enables the dockerized tests that we had in the old CI pipeline.
Also add support for ipv6 to the docker generator


This change is Reviewable

@lukedirtwalker lukedirtwalker force-pushed the pubDockerIntegration branch 3 times, most recently from 078c564 to 4af2547 Compare January 22, 2020 14:20
@lukedirtwalker lukedirtwalker marked this pull request as ready for review January 22, 2020 14:38
Copy link
Contributor

@karampok karampok left a comment

Choose a reason for hiding this comment

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

Reviewed 12 of 12 files at r1.
Reviewable status: all files reviewed, 6 unresolved discussions (waiting on @lukedirtwalker)


scion.sh, line 56 at r1 (raw file):

        if is_docker_be; then
            echo "Build perapp images"
            ./tools/quiet make -C docker/perapp bazel

I would drop the quite script.
Personally I would prefer to avoid having another layer of wrapper.
bazel run //docker/perapp:prod should be enough


scion.sh, line 58 at r1 (raw file):

            ./tools/quiet make -C docker/perapp bazel
            echo "Build scion tester"
            ./tools/quiet ./docker.sh tester
bazel run //docker/testimages:scion_testing_bundle 

.buildkite/pipeline.yml, line 98 at r1 (raw file):

  - label: ":docker: Integration: end2end_integration"
    command:
    - ./scion.sh topology -t -d -c topology/Tiny.topo

I would have bazel build the images in bullet before the run step.

Tiny or Tiny4?


.buildkite/pipeline.yml, line 100 at r1 (raw file):

    - ./scion.sh topology -t -d -c topology/Tiny.topo
    - ./scion.sh run
    - ./tools/dc start 'tester*'

dc is a wrapper to docker-compose, it's worth start reducing the usage of it


topology/Tiny.topo, line 1 at r1 (raw file):

--- # Tiny Topology

Tiny6 should be better name now


topology/Tiny4.topo, line 1 at r1 (raw file):

--- # Tiny Topology IPv4 only

why we need to introduce a Tiny with v4?

Copy link
Collaborator Author

@lukedirtwalker lukedirtwalker left a comment

Choose a reason for hiding this comment

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

Reviewable status: 11 of 12 files reviewed, 6 unresolved discussions (waiting on @karampok)


scion.sh, line 56 at r1 (raw file):

Previously, karampok (Konstantinos) wrote…

I would drop the quite script.
Personally I would prefer to avoid having another layer of wrapper.
bazel run //docker/perapp:prod should be enough

this wouldn't build the SIG container, which might be needed for some users.


scion.sh, line 58 at r1 (raw file):

Previously, karampok (Konstantinos) wrote…
bazel run //docker/testimages:scion_testing_bundle 

this doesn't build the sig testing image, which might be needed for some users.


.buildkite/pipeline.yml, line 98 at r1 (raw file):

Previously, karampok (Konstantinos) wrote…

I would have bazel build the images in bullet before the run step.

Tiny or Tiny4?

Tiny


.buildkite/pipeline.yml, line 100 at r1 (raw file):

Previously, karampok (Konstantinos) wrote…

dc is a wrapper to docker-compose, it's worth start reducing the usage of it

done.


topology/Tiny.topo, line 1 at r1 (raw file):

Previously, karampok (Konstantinos) wrote…

Tiny6 should be better name now

No, I think this should be the new default. v4 should be deleted.


topology/Tiny4.topo, line 1 at r1 (raw file):

Previously, karampok (Konstantinos) wrote…

why we need to introduce a Tiny with v4?

because some acceptance tests are built with v4 in mind. I don't want to change them right now.

Copy link
Contributor

@karampok karampok left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r2.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@karampok karampok left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@karampok karampok left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r3.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@lukedirtwalker lukedirtwalker merged commit 15878db into scionproto:master Jan 23, 2020
@lukedirtwalker lukedirtwalker deleted the pubDockerIntegration branch January 23, 2020 10:18
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.

2 participants