Fix Zuul job host targeting
- Move to ubuntu-focal to account for: http://lists.opendev.org/pipermail/service-announce/2021-May/000019.html - Set an explicit nodeset on jobs to prevent this issue in the future - Fix unit test and doc gen issues which cropped up while CI was falsely passing Closes: #22 Signed-off-by: Sean Eagan <seaneagan1@gmail.com> Change-Id: I4a53d2099c29ad3fc7a8188a9153008c56a7fd72
This commit is contained in:
Sean Eagan
parent
8a75ff0ecf
commit
a938b1eec6
|
|
@ -222,6 +222,34 @@ service since we have the below node port range instead.</p>
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<h3 id="airship.airshipit.org/v1.NetworkData">NetworkData
|
||||
</h3>
|
||||
<div class="md-typeset__scrollwrap">
|
||||
<div class="md-typeset__table">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Field</th>
|
||||
<th>Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<code>networks</code><br>
|
||||
<em>
|
||||
<a href="#airship.airshipit.org/v1.OpenstackNetwork">
|
||||
[]OpenstackNetwork
|
||||
</a>
|
||||
</em>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<h3 id="airship.airshipit.org/v1.NodeCount">NodeCount
|
||||
</h3>
|
||||
<p>
|
||||
|
|
@ -333,6 +361,46 @@ NodeCount
|
|||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<h3 id="airship.airshipit.org/v1.OpenstackNetwork">OpenstackNetwork
|
||||
</h3>
|
||||
<p>
|
||||
(<em>Appears on:</em>
|
||||
<a href="#airship.airshipit.org/v1.NetworkData">NetworkData</a>)
|
||||
</p>
|
||||
<div class="md-typeset__scrollwrap">
|
||||
<div class="md-typeset__table">
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Field</th>
|
||||
<th>Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
<code>id</code><br>
|
||||
<em>
|
||||
string
|
||||
</em>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<code>ip_address</code><br>
|
||||
<em>
|
||||
string
|
||||
</em>
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<h3 id="airship.airshipit.org/v1.PortRange">PortRange
|
||||
</h3>
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ var _ = Describe("Service Set", func() {
|
|||
BMH: *bmh1,
|
||||
Data: &bmh.MachineData{
|
||||
IPOnInterface: map[string]string{
|
||||
"eno3": ip1,
|
||||
"oam-ipv4": ip1,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
@ -71,7 +71,7 @@ var _ = Describe("Service Set", func() {
|
|||
BMH: *bmh2,
|
||||
Data: &bmh.MachineData{
|
||||
IPOnInterface: map[string]string{
|
||||
"eno3": ip2,
|
||||
"oam-ipv4": ip2,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
- hosts: ubuntu-bionic
|
||||
- hosts: ubuntu-focal
|
||||
tasks:
|
||||
- name: Run docker-install
|
||||
include_role:
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
- hosts: ubuntu-bionic
|
||||
- hosts: ubuntu-focal
|
||||
tasks:
|
||||
- name: Setup Docker
|
||||
include_role:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
- hosts: ubuntu-bionic
|
||||
- hosts: ubuntu-focal
|
||||
environment:
|
||||
GOROOT: '/usr/local/go'
|
||||
GOBIN: /tmp/bin/
|
||||
|
|
|
|||
|
|
@ -365,7 +365,7 @@ func CreateSIPCluster(name string, namespace string, controlPlanes int, workers
|
|||
{
|
||||
SIPClusterService: airshipv1.SIPClusterService{
|
||||
Image: "quay.io/airshipit/jump-host",
|
||||
NodeInterface: "eno3",
|
||||
NodeInterface: "oam-ipv4",
|
||||
},
|
||||
NodePort: 30000,
|
||||
SSHAuthorizedKeys: []string{
|
||||
|
|
@ -378,7 +378,7 @@ func CreateSIPCluster(name string, namespace string, controlPlanes int, workers
|
|||
LoadBalancerControlPlane: []airshipv1.LoadBalancerServiceControlPlane{
|
||||
{
|
||||
SIPClusterService: airshipv1.SIPClusterService{
|
||||
NodeInterface: "eno3",
|
||||
NodeInterface: "oam-ipv4",
|
||||
},
|
||||
NodePort: 30001,
|
||||
},
|
||||
|
|
@ -386,7 +386,7 @@ func CreateSIPCluster(name string, namespace string, controlPlanes int, workers
|
|||
LoadBalancerWorker: []airshipv1.LoadBalancerServiceWorker{
|
||||
{
|
||||
SIPClusterService: airshipv1.SIPClusterService{
|
||||
NodeInterface: "eno3",
|
||||
NodeInterface: "oam-ipv4",
|
||||
},
|
||||
NodePortRange: airshipv1.PortRange{
|
||||
Start: 30002,
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
pass-to-parent: true
|
||||
- job:
|
||||
name: airship-deploy-sip
|
||||
nodeset: ubuntu-focal
|
||||
run: playbooks/integration-tests.yaml
|
||||
description: Deploys kubernetes and sip
|
||||
roles:
|
||||
|
|
@ -17,6 +18,7 @@
|
|||
timeout: 9600
|
||||
- job:
|
||||
name: airship-sip-test-suite
|
||||
nodeset: ubuntu-focal
|
||||
description: Install kube-builder and tests make functionality.
|
||||
run: playbooks/test-sip.yaml
|
||||
roles:
|
||||
|
|
@ -24,6 +26,7 @@
|
|||
timeout: 9600
|
||||
- job:
|
||||
name: airship-sip-publish-images
|
||||
nodeset: ubuntu-focal
|
||||
description: Publishes SIP Docker images to image repository.
|
||||
run: playbooks/publish-images.yaml
|
||||
roles:
|
||||
|
|
|
|||
Loading…
Reference in New Issue