mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge release branch 4.19 to main
* 4.19: UI: ignore error when list public ips for CKS clusters on Shared network (#8489) Infra25725 add codecov token to workflow (#8960)
This commit is contained in:
commit
65eef59e0b
1
.github/workflows/ci.yml
vendored
1
.github/workflows/ci.yml
vendored
@ -320,3 +320,4 @@ jobs:
|
|||||||
flags: simulator-marvin-tests
|
flags: simulator-marvin-tests
|
||||||
verbose: true
|
verbose: true
|
||||||
name: codecov
|
name: codecov
|
||||||
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
|
|||||||
3
.github/workflows/codecov.yml
vendored
3
.github/workflows/codecov.yml
vendored
@ -53,6 +53,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
files: ./client/target/site/jacoco-aggregate/jacoco.xml
|
files: ./client/target/site/jacoco-aggregate/jacoco.xml
|
||||||
fail_ci_if_error: true
|
fail_ci_if_error: true
|
||||||
flags: unit-tests
|
flags: unittests
|
||||||
verbose: true
|
verbose: true
|
||||||
name: codecov
|
name: codecov
|
||||||
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
|
|||||||
1
.github/workflows/ui.yml
vendored
1
.github/workflows/ui.yml
vendored
@ -63,3 +63,4 @@ jobs:
|
|||||||
flags: uitests
|
flags: uitests
|
||||||
verbose: true
|
verbose: true
|
||||||
name: codecov
|
name: codecov
|
||||||
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
|
|||||||
@ -205,7 +205,7 @@ export default {
|
|||||||
virtualmachines: [],
|
virtualmachines: [],
|
||||||
vmColumns: [],
|
vmColumns: [],
|
||||||
networkLoading: false,
|
networkLoading: false,
|
||||||
network: {},
|
network: null,
|
||||||
publicIpAddress: null,
|
publicIpAddress: null,
|
||||||
currentTab: 'details',
|
currentTab: 'details',
|
||||||
cksSshStartingPort: 2222,
|
cksSshStartingPort: 2222,
|
||||||
@ -386,7 +386,27 @@ export default {
|
|||||||
this.virtualmachines.map(x => { x.ipaddress = x.nic[0].ipaddress })
|
this.virtualmachines.map(x => { x.ipaddress = x.nic[0].ipaddress })
|
||||||
this.instanceLoading = false
|
this.instanceLoading = false
|
||||||
},
|
},
|
||||||
fetchPublicIpAddress () {
|
fetchNetwork () {
|
||||||
|
this.networkLoading = true
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
api('listNetworks', {
|
||||||
|
listAll: true,
|
||||||
|
id: this.resource.networkid
|
||||||
|
}).then(json => {
|
||||||
|
const networks = json.listnetworksresponse.network
|
||||||
|
if (this.arrayHasItems(networks)) {
|
||||||
|
this.network = networks[0]
|
||||||
|
}
|
||||||
|
})
|
||||||
|
this.networkLoading = false
|
||||||
|
})
|
||||||
|
},
|
||||||
|
async fetchPublicIpAddress () {
|
||||||
|
await this.fetchNetwork()
|
||||||
|
if (this.network && this.network.type === 'Shared') {
|
||||||
|
this.publicIpAddress = null
|
||||||
|
return
|
||||||
|
}
|
||||||
this.networkLoading = true
|
this.networkLoading = true
|
||||||
var params = {
|
var params = {
|
||||||
listAll: true,
|
listAll: true,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user