diff --git a/.github/actions/docker_setup/action.yml b/.github/actions/docker_setup/action.yml index 06388e4175c1..60c9a17519a6 100644 --- a/.github/actions/docker_setup/action.yml +++ b/.github/actions/docker_setup/action.yml @@ -1,15 +1,17 @@ name: Docker setup description: Setup docker inputs: - nested_job: - description: the fuse for unintended use inside of the reusable callable jobs - default: true - type: boolean + test_name: + description: name of the test, used in determining ipv6 configs. + default: None + type: string runs: using: "composite" steps: - name: Docker IPv6 configuration shell: bash + env: + ipv6_subnet: ${{ contains(inputs.test_name, 'Integration') && '2001:db8:1::/64' || '2001:3984:3989::/64' }} run: | # make sure docker uses proper IPv6 config sudo touch /etc/docker/daemon.json @@ -17,7 +19,7 @@ runs: sudo cat < /etc/docker/daemon.json { "ipv6": true, - "fixed-cidr-v6": "2001:3984:3989::/64" + "fixed-cidr-v6": "${{ env.ipv6_subnet }}" } EOT sudo chown root:root /etc/docker/daemon.json diff --git a/.github/workflows/reusable_test.yml b/.github/workflows/reusable_test.yml index dc81ebd2c3f3..4867cab03480 100644 --- a/.github/workflows/reusable_test.yml +++ b/.github/workflows/reusable_test.yml @@ -116,6 +116,8 @@ jobs: job_type: test - name: Docker setup uses: ./.github/actions/docker_setup + with: + test_name: ${{ inputs.test_name }} - name: Setup batch if: ${{ fromJson(inputs.data).jobs_data.jobs_params[inputs.test_name].num_batches > 1 }} run: |