elysium/qualiteer
elysium/qualiteer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrades people!

Browse source
This commit is contained in:
Dunemask 2022-08-09 04:29:10 +00:00
parent f84234150f
commit 8ad56e8d38
40 changed files with 483 additions and 379 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
bin/executor
View file

Binary file not shown.

2
dist/bundles/qualiteer-executor.mjs vendored
View file

File diff suppressed because one or more lines are too long

8
executor.config.js
View file

@ -1,7 +1,7 @@
export default function executorConfig(args){
export default function executorConfig(payload){
return {
command: ()=> args.slice(2),
url: process.env.QUALITEER_URL,
jobId: () => args[1],
command: ({command})=> command,
url: ({url})=>url ,
jobId: ({jobId}) => jobId,
}
}

16
lib/database/queries/alerting.js
View file

@ -10,13 +10,15 @@ const table = "silenced_tests";
const PG_DISABLED = process.env.POSTGRES_DISABLED;
const silencedMock = () => {
return [{
name: `failing`,
class: `failing.js`,
method: "FAKEMETHOD",
id: 0,
silencedUntil: new Date().toJSON(),
}]
return [
{
name: `failing`,
class: `failing.js`,
method: "FAKEMETHOD",
id: 0,
silencedUntil: new Date().toJSON(),
},
];
};
// Queries

45
lib/database/queries/catalog.js
View file

@ -20,12 +20,12 @@ const testsMock = () => {
isCompound: false,
type: "api",
description: "This is a single test",
tags: ["cron_1hour","reg_us", "env_ci", "proj_core", "skip_alt"],
tags: ["cron_1hour", "reg_us", "env_ci", "proj_core", "skip_alt"],
path: "tests/assets/suite/single.js",
created: Date.now(),
mergeRequest: "https://example.com"
mergeRequest: "https://example.com",
},
{
{
id: 1,
name: "failing",
class: "failing.js",
@ -33,12 +33,12 @@ const testsMock = () => {
isCompound: false,
type: "ui",
description: "This is a failing test",
tags: ["cron_1hour","reg_us", "env_ci", "proj_core"],
tags: ["cron_1hour", "reg_us", "env_ci", "proj_core"],
path: "tests/assets/suite/failing.js",
created: Date.now(),
mergeRequest: "https://example.com"
mergeRequest: "https://example.com",
},
{
{
id: 2,
name: "primary",
class: "primary.js",
@ -46,11 +46,18 @@ const testsMock = () => {
isCompound: true,
type: "api",
description: "This is a primary test",
tags: ["cron_1hour","reg_us", "proj_core", "skip_alt", "compound_secondary"],
tags: [
"cron_1hour",
"reg_us",
"proj_core",
"skip_alt",
"compound_secondary",
],
path: "tests/assets/suite/primary.js",
created: Date.now(),
mergeRequest: "https://example.com"
}, {
mergeRequest: "https://example.com",
},
{
id: 3,
name: "secondary",
class: "secondary.js",
@ -58,12 +65,12 @@ const testsMock = () => {
isCompound: true,
type: "api",
description: "This is a secondary test",
tags: ["cron_1hour","reg_us", "proj_core", "compound_tertiary"],
tags: ["cron_1hour", "reg_us", "proj_core", "compound_tertiary"],
path: "tests/assets/suite/secondary.js",
created: Date.now(),
mergeRequest: "https://example.com"
mergeRequest: "https://example.com",
},
{
{
id: 4,
name: "tertiary",
class: "tertiary.js",
@ -71,21 +78,21 @@ const testsMock = () => {
isCompound: true,
type: "api",
description: "This is a single test",
tags: ["cron_1hour","reg_us", "proj_core"],
tags: ["cron_1hour", "reg_us", "proj_core"],
path: "tests/assets/suite/tertiary.js",
created: Date.now(),
mergeRequest: "https://example.com"
mergeRequest: "https://example.com",
},
];
};
const mappingsMock = () => {
return [
["primary", "secondary1", "tertiary1"],
["primary", "secondary1", "tertiary2"],
["primary", "secondary2", "tertiary3"],
];
}
["primary", "secondary1", "tertiary1"],
["primary", "secondary1", "tertiary2"],
["primary", "secondary2", "tertiary3"],
];
};
export const getTests = async () => {
if (PG_DISABLED) return testsMock();

54
lib/database/queries/results.js
View file

@ -10,33 +10,35 @@ import {
const table = "test_results";
const PG_DISABLED = process.env.POSTGRES_DISABLED;
const failingMock = () => {
return [{
name: "failing",
class: "failing.js",
timestamp: new Date().toJSON(),
method: "FAKEMETHOD",
cron: "1hour",
type: "api",
dailyFails: 12,
screenshot: "https://picsum.photos/1920/1080",
recentResults: [1, 0, 0, 1, 0],
isCompound: false,
failedMessage: `Some Test FailureMessage`,
},{
name: "secondary",
class: "secondary.js",
timestamp: new Date().toJSON(),
method: "FAKEMETHOD",
cron: "1hour",
type: "api",
dailyFails: 1,
screenshot: "https://picsum.photos/1920/1080",
recentResults: [1, 0, 0, 1, 0],
isCompound: true,
failedMessage: `Some Test FailureMessage from Secondary`,
}]
return [
{
name: "failing",
class: "failing.js",
timestamp: new Date().toJSON(),
method: "FAKEMETHOD",
cron: "1hour",
type: "api",
dailyFails: 12,
screenshot: "https://picsum.photos/1920/1080",
recentResults: [1, 0, 0, 1, 0],
isCompound: false,
failedMessage: `Some Test FailureMessage`,
},
{
name: "secondary",
class: "secondary.js",
timestamp: new Date().toJSON(),
method: "FAKEMETHOD",
cron: "1hour",
type: "api",
dailyFails: 1,
screenshot: "https://picsum.photos/1920/1080",
recentResults: [1, 0, 0, 1, 0],
isCompound: true,
failedMessage: `Some Test FailureMessage from Secondary`,
},
];
};
// Queries
export const insertTestResult = (testResult) => {

5
lib/jobs/executor/executor-entrypoint.js
View file

@ -7,7 +7,8 @@ const { default: executorConfig } = await import(
// Load config and args
const args = process.argv.slice(2);
const config = normalize(executorConfig(args));
const payload = JSON.parse(Buffer.from(args[0], "base64").toString("utf8"));
const config = normalize(executorConfig(payload));
// Start Executor
const exec = new Executor(args, config);
const exec = new Executor(config, payload);
exec.runJob();

12
lib/jobs/job-builder.js
View file

@ -34,9 +34,15 @@ const pipelineMaxLife = (testName) => {
const buildCompound = (jobReq, socketId) => {
const { testName, command } = jobReq;
const pipelineTriggers = jobReq.pipelineTriggers;
if (pipelineTriggers) command.push(`pipelineTriggers=${pipelineTriggers}`);
command.push(`pipelineDashboardSocket=${socketId}`);
const { pipeline } = jobReq;
if (pipeline) {
pipeline.dashboardSocketId = socketId;
const pipelineArg = Buffer.from(JSON.stringify(pipeline), "utf8").toString(
"base64"
);
command.push(`pipeline=${pipelineArg}`);
}
return { ...jobReq, command };
};

4
lib/jobs/k8s/k8s-bypass.js
View file

@ -7,8 +7,8 @@ const { command } = job.spec.template.spec.containers[0];
INFO("EXEC", "Internal Executor Starting!");
cp.exec(command, (error, stdout, stderr) => {
if (error) ERR("EXEC", error);
//if(stdout) VERB("EXEC-STDOUT", stdout);
//if(stderr) VERB("EXEC-STDERR", stderr);
//if (stdout) VERB("EXEC-STDOUT", stdout);
//if (stderr) VERB("EXEC-STDERR", stderr);
OK("EXEC", "Internal Executor Finished!");
process.exit(error ? 1 : 0);
});

8
lib/jobs/k8s/kubernetes.js
View file

@ -22,9 +22,11 @@ const wrapCommand = (jobId, command) => {
? `node ${executorBin}`
: `chmod +x ${executorBin} && ./${executorBin}`;
const cmd = command.map((arg) => JSON.stringify(arg));
const curlCmd = `curl -o qltr-executor ${executorUrl} && ${bin} ${qualiteerUrl} ${jobId} ${cmd.join(
" "
)}`;
const payload = Buffer.from(
JSON.stringify({ jobId, command, url: qualiteerUrl }),
"utf8"
).toString("base64");
const curlCmd = `curl -o qltr-executor ${executorUrl} && ${bin} ${payload}`;
return curlCmd;
};

32
lib/jobs/pipelines.js
View file

@ -7,25 +7,25 @@ const nest = (arr) => {
};
export const asTree = (branches) => {
const nests = branches.map((b)=>nest(b));
return _.merge(...nests);
};
const nests = branches.map((b) => nest(b));
return _.merge(...nests);
};
export const asBranches = (array) => {
const merged = [];
array.forEach((p, i) => {
p.forEach((v, i) => {
if (!merged[i]) merged[i] = [];
if (!merged[i].includes(v)) merged[i].push(v);
});
const merged = [];
array.forEach((p, i) => {
p.forEach((v, i) => {
if (!merged[i]) merged[i] = [];
if (!merged[i].includes(v)) merged[i].push(v);
});
return merged;
}
});
return merged;
};
export const as1d = (a) => [].concat.apply([], a);
export const selectBranch = (map,test) => {
const pipeline = map.find((pm)=>pm.includes(test));
const testIndex = pipeline.findIndex((t) => t === test);
return pipeline.slice(0, testIndex + 1);
}
export const selectBranch = (map, test) => {
const pipeline = map.find((pm) => pm.includes(test));
const testIndex = pipeline.findIndex((t) => t === test);
return pipeline.slice(0, testIndex + 1);
};

19
lib/rabbit/workers/TestResultsWorker.js
View file

@ -24,21 +24,18 @@ export default class TestResultsWorker extends Worker {
}
*/
onMessage(testResult) {
const { pipelineData, pipelineTriggers, pipelineDelay } = testResult;
const pipelineTrigger = { pipelineData, pipelineTriggers, pipelineDelay };
const { pipeline } = testResult;
// Alter to start next test
// TODO the delay should be autopopulated either by the suite, or filled in by the server
if (pipelineTriggers)
return this.pipelineTrigger(
pipelineTrigger,
testResult.pipelineDashboardSocket
);
this.pipelineClose(testResult.pipelineDashboardSocket);
if (pipeline) return this.pipelineTrigger(pipeline);
const { dashboardSocketId: dsi } = pipeline;
this.pipelineClose(dsi);
}
pipelineTrigger(pipelineTrigger, socketId) {
pipelineTrigger.pipelineDelay = 1000 * 5;
this.skio.to(socketId).emit(evt.PPL_TRG, pipelineTrigger);
pipelineTrigger(pipeline) {
const { dashboardSocketId: dsi } = pipeline;
this.skio.to(dsi).emit(evt.PPL_TRG, pipeline);
}
pipelineClose(socketId) {

2
lib/routes/alerting-route.js
View file

@ -7,7 +7,7 @@ router.use(jsonMiddleware());
// Get Routes
router.get("/silenced", (req, res) => {
getSilencedTests().then((t)=>res.send(t));
getSilencedTests().then((t) => res.send(t));
});
// Post Routes

8
lib/routes/catalog-route.js
View file

@ -9,12 +9,12 @@ router.use(jsonMiddleware({ limit: maxSize }));
// Get Routes
router.get("/tests", (req, res) => {
getTests().then((t)=>res.json(t));
getTests().then((t) => res.json(t));
});
router.get("/pipeline-mappings", (req,res)=>{
getPipelineMappings().then((m)=>res.json(m));
})
router.get("/pipeline-mappings", (req, res) => {
getPipelineMappings().then((m) => res.json(m));
});
// Post Routes
router.post("/update", (req, res) => {

2
lib/routes/results-route.js
View file

@ -7,7 +7,7 @@ router.use(jsonMiddleware());
// Get Routes
router.get("/failing", (req, res) => {
getCurrentlyFailing().then((f)=>res.json(f));
getCurrentlyFailing().then((f) => res.json(f));
});
// Post Routes

16
lib/sockets/clients/Executor.js
View file

@ -12,10 +12,10 @@ const ERR = "e";
const OUT = "o";
export default class Executor {
constructor(args, config, options = {}) {
this.url = config.url(args) ?? process.env.QUALITEER_URL;
this.jobId = config.jobId(args) ?? process.env.QUALITEER_JOB_ID;
this.command = config.command(args) ?? process.env.QUALITEER_COMMAND;
constructor(config, payload) {
this.url = config.url(payload) ?? process.env.QUALITEER_URL;
this.jobId = config.jobId(payload) ?? process.env.QUALITEER_JOB_ID;
this.command = config.command(payload) ?? process.env.QUALITEER_COMMAND;
this.mode = modes.EXEC;
// Internal Buffer
@ -24,10 +24,10 @@ export default class Executor {
this.buf[OUT] = "";
// Methods
this.spawn = options.spawn ?? this.spawn.bind(this);
this.report = options.report ?? this.report.bind(this);
this.onProcClose = options.onProcClose ?? this.onProcClose.bind(this);
this.onClose = options.onClose ?? this.onClose.bind(this);
this.spawn = this.spawn.bind(this);
this.report = this.report.bind(this);
this.onProcClose = this.onProcClose.bind(this);
this.onClose = this.onClose.bind(this);
}
spawn() {

49
lib/sockets/clients/Initiator.js
View file

@ -54,29 +54,32 @@ export default class Initiator {
onCreate = onCreate ?? this.onCreate.bind(this);
onPipelineTrigger =
onPipelineTrigger ??
((trigger) => {
console.log("job trg:", trigger);
const testName = trigger.pipelineTriggers;
const pipelineData = trigger.pipelineData;
const pipelineTriggers = trigger.newPipelineTriggers;
const jobReq = {
...jobRequest,
testName,
pipelineData,
pipelineTriggers,
};
setTimeout(
() =>
this.newPipelineJob(
jobReq,
onLog,
onClose,
onCreate,
onPipelineTrigger,
onPipelineClose
),
trigger.pipelineDelay
);
((pipeline) => {
console.log("job trg:", pipeline);
const { triggers } = pipeline;
if (!Object.keys(triggers).length) onPipelineClose();
// For each trigger
for (var testName in triggers) {
const delay = triggers[testName].__testDelay ?? 0;
delete triggers[testName].__testDelay;
const jobReq = {
...jobRequest,
pipeline: { ...pipeline, triggers: triggers[testName] },
testName,
};
setTimeout(
() =>
this.newPipelineJob(
jobReq,
onLog,
onClose,
onCreate,
onPipelineTrigger,
onPipelineClose
),
delay
);
}
});
onPipelineClose = onPipelineClose ?? this.onPipelineClose.bind(this);
this.sk = mgr.socket("/");

20
src/Dashboard.jsx
View file

@ -1,24 +1,24 @@
// Import Contexts
import { QueryClient, QueryClientProvider} from '@tanstack/react-query'
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { JobProvider } from "./ctx/JobContext.jsx";
import { StoreProvider } from "./ctx/StoreContext.jsx";
import { BrowserRouter } from "react-router-dom";
// Import Views
import Views from "./views/Views.jsx";
const queryClient = new QueryClient()
const queryClient = new QueryClient();
export default function Dashboard() {
return (
<div className="qualiteer">
<QueryClientProvider client={queryClient}>
<StoreProvider>
<JobProvider>
<BrowserRouter>
<Views />
</BrowserRouter>
</JobProvider>
</StoreProvider>
<QueryClientProvider client={queryClient}>
<StoreProvider>
<JobProvider>
<BrowserRouter>
<Views />
</BrowserRouter>
</JobProvider>
</StoreProvider>
</QueryClientProvider>
</div>
);

33
src/Queries.jsx
View file

@ -1,25 +1,28 @@
import { useQuery } from '@tanstack/react-query'
import { useQuery } from "@tanstack/react-query";
const QUALITEER_URL = "https://qualiteer.elijahparker3.repl.co/api";
const useMock = false;
const useMock = true;
const asMock = (data) => ({ data });
const fetchApi = (subPath)=> async ()=> fetch(`${QUALITEER_URL}${subPath}`).then((res)=>res.json());
const fetchApi = (subPath) => async () =>
fetch(`${QUALITEER_URL}${subPath}`).then((res) => res.json());
export const useCatalogTests = () => useMock ? asMock([]): useQuery(['catalogTests'], fetchApi("/catalog/tests")
)
export const useCatalogTests = () =>
useMock ? asMock([]) : useQuery(["catalogTests"], fetchApi("/catalog/tests"));
export const usePipelineMappings = () => useMock ? asMock([
["primary", "secondary1", "tertiary1"],
["primary", "secondary1", "tertiary2"],
["primary", "secondary2", "tertiary3"],
]) : useQuery(['pipelineMappings'], fetchApi("/catalog/pipeline-mappings")
)
export const usePipelineMappings = () =>
useMock
? asMock([
["primary", "secondary1", "tertiary1"],
["primary", "secondary1", "tertiary2"],
["primary", "secondary2", "tertiary3"],
])
: useQuery(["pipelineMappings"], fetchApi("/catalog/pipeline-mappings"));
export const useSilencedAlerts = () => useMock? asMock([]) : useQuery(['silenced'], fetchApi("/alerting/silenced")
)
export const useSilencedAlerts = () =>
useMock ? asMock([]) : useQuery(["silenced"], fetchApi("/alerting/silenced"));
export const useCurrentlyFailing = () => useMock? asMock([]) : useQuery(['failing'], fetchApi("/results/failing")
)
export const useCurrentlyFailing = () =>
useMock ? asMock([]) : useQuery(["failing"], fetchApi("/results/failing"));

70
src/ctx/JobContext.jsx
View file

@ -15,7 +15,7 @@ const ACTIONS = {
CREATE: "c",
UPDATE: "u",
DELETE: "d",
PIPELINE: "p"
PIPELINE: "p",
};
const url = "https://qualiteer.elijahparker3.repl.co/";
@ -44,7 +44,9 @@ const reducer = (state, action) => {
return { ...state, jobs };
case ACTIONS.UPDATE:
jobIndex = jobs.findIndex((j) => j.jobId === (action.job.jobId ?? action.jobId));
jobIndex = jobs.findIndex(
(j) => j.jobId === (action.job.jobId ?? action.jobId)
);
jobs[jobIndex] = { ...jobs[jobIndex], ...action.job };
return { ...state, jobs };
@ -54,7 +56,7 @@ const reducer = (state, action) => {
return { ...state, jobs };
case ACTIONS.PIPELINE:
return {...state, pipelines};
return { ...state, pipelines };
default:
return state;
}
@ -69,25 +71,26 @@ export const JobProvider = ({ children }) => {
dispatch({ type: ACTIONS.CREATE, job: { ...job, log: [] } });
const jobDelete = (jobId) => dispatch({ type: ACTIONS.DELETE, jobId });
const updatePipelines = (pipelines) => dispatch({type: ACTIONS.pipeline, pipelines});
const updatePipelines = (pipelines) =>
dispatch({ type: ACTIONS.pipeline, pipelines });
function retryAll(failing) {
// Query Full Locator
console.log("Would retry all failing tests!");
return jobFactory({ testNames: ["single"] });
}
function pipelineComponentJob(jobPipeline, testName){
function pipelineComponentJob(jobPipeline, testName) {
const i = new Initiator(url);
const jobId = `j${Date.now()}`;
const job = {
const job = {
name: jobId,
status: jobStatus.PENDING,
jobId,
isPipeline: true,
builderCache: {},
initiator: i,
}
};
const request = {
testName,
image: "node",
@ -95,9 +98,9 @@ export const JobProvider = ({ children }) => {
name: jobId,
pipelineTriggers: "secondary",
};
jobCreate(job);
const onLog = (d) => {
const onLog = (d) => {
const job = state.jobs.find((j) => j.jobId === jobId);
job.log.push(d);
job.status = jobStatus.ACTIVE;
@ -112,41 +115,48 @@ export const JobProvider = ({ children }) => {
};
const onPipelineTrigger = (trigger) => {
console.log("Got trigger", trigger);
}
const started = i.newPipelineJob(request, onLog, onClose, onPipelineTrigger);
started.then(() => jobUpdate({ status: jobStatus.ACTIVE }, jobId));
};
const started = i.newPipelineJob(
request,
onLog,
onClose,
onPipelineTrigger
);
started.then(() => jobUpdate({ status: jobStatus.ACTIVE }, jobId));
}
function pipelineFactory(builderCache) {
console.log("Would create pipeline with cache");
console.log(builderCache);
return pipelineComponentJob(state.pipelines, builderCache.branches[0][0]);
// return jobId;
// return jobId;
/*return jobFactory({testNames: ["primary"]});*/
}
function jobCancel(jobId){
const job = state.jobs.find((j)=>j.jobId===jobId);
if(job.initiator.sk) job.initiator.sk.close();
function jobCancel(jobId) {
const job = state.jobs.find((j) => j.jobId === jobId);
if (job.initiator.sk) job.initiator.sk.close();
job.status = jobStatus.CANCELED;
jobUpdate({ ...job }, jobId);
}
function jobDestroy(jobId){
const job = state.jobs.find((j)=>j.jobId===jobId);
if(job.initiator.sk && job.status !== jobStatus.OK && job.status !== jobStatus.ERROR && job.status !== jobStatus.CANCELED){
job.initiator.sk.close();
function jobDestroy(jobId) {
const job = state.jobs.find((j) => j.jobId === jobId);
if (
job.initiator.sk &&
job.status !== jobStatus.OK &&
job.status !== jobStatus.ERROR &&
job.status !== jobStatus.CANCELED
) {
job.initiator.sk.close();
}
jobDelete(jobId);
}
function jobFactory(builderCache) {
if(builderCache.tree) return pipelineFactory(builderCache);
if (builderCache.tree) return pipelineFactory(builderCache);
// Find test
const i = new Initiator(url);
const jobId = `j${Date.now()}`;
@ -184,7 +194,7 @@ export const JobProvider = ({ children }) => {
const started = i.newJob(request, onLog, onClose);
started.then(() => jobUpdate({ status: jobStatus.ACTIVE }, jobId));
return jobId;
}
@ -197,7 +207,7 @@ export const JobProvider = ({ children }) => {
retryAll,
jobFactory,
jobCancel,
jobDestroy
jobDestroy,
};
const contextValue = useMemo(() => context, [state, dispatch]);

12
src/views/Navbar.jsx
View file

@ -1,5 +1,5 @@
import { useContext, useState } from "react";
import {useCurrentlyFailing} from "../Queries.jsx";
import { useCurrentlyFailing } from "../Queries.jsx";
import JobContext from "../ctx/JobContext.jsx";
import StoreContext from "../ctx/StoreContext.jsx";
@ -24,18 +24,22 @@ import FormatListBulletedIcon from "@mui/icons-material/FormatListBulleted";
import SettingsIcon from "@mui/icons-material/Settings";
import WarningIcon from "@mui/icons-material/Warning";
import InfoIcon from "@mui/icons-material/Info";
import SentimentSatisfiedAltIcon from '@mui/icons-material/SentimentSatisfiedAlt';
import SentimentSatisfiedAltIcon from "@mui/icons-material/SentimentSatisfiedAlt";
const drawerWidth = 250;
export default function Navbar(props) {
const { state: jobState } = useContext(JobContext);
const { state: store } = useContext(StoreContext);
const {isLoading, data: failing} = useCurrentlyFailing();
const { isLoading, data: failing } = useCurrentlyFailing();
const pages = store.pages;
const icons = [
<Badge badgeContent={(failing ?? []).length} color="error">
{(failing ?? []).length > 0 ? <WarningIcon />: <SentimentSatisfiedAltIcon/>}
{(failing ?? []).length > 0 ? (
<WarningIcon />
) : (
<SentimentSatisfiedAltIcon />
)}
</Badge>,
<NotificationsIcon />,
<Badge badgeContent={jobState.jobs.length} color="primary">

4
src/views/Views.jsx
View file

@ -33,7 +33,9 @@ export default function Views() {
<Route
exact
path="/"
element={<Navigate to={`/qualiteer/${store.defaultPage}`} replace />}
element={
<Navigate to={`/qualiteer/${store.defaultPage}`} replace />
}
/>
<Route path="/qualiteer/failing" element={<Failing />} />
<Route path="/qualiteer/alerting" element={<Alerting />} />

71
src/views/alerting/Alerting.jsx
View file

@ -1,5 +1,5 @@
import React, { useState, useContext } from "react";
import {useSilencedAlerts} from "../../Queries.jsx";
import { useSilencedAlerts } from "../../Queries.jsx";
import StoreContext from "../../ctx/StoreContext.jsx";
import SilencedBox from "./SilencedBox.jsx";
import SilenceDialog from "./SilenceDialog.jsx";
@ -18,13 +18,9 @@ import Typography from "@mui/material/Typography";
import Box from "@mui/material/Box";
export default function Alerting() {
const {
updateStore,
silenceRequest,
} = useContext(StoreContext);
const { updateStore, silenceRequest } = useContext(StoreContext);
const {isLoading, data: silenced} = useSilencedAlerts();
const { isLoading, data: silenced } = useSilencedAlerts();
const [silenceEntry, setSilenceEntry] = useState({
open: false,
@ -61,36 +57,41 @@ const {isLoading, data: silenced} = useSilencedAlerts();
return (
<div className="alerting">
{isLoading? null : silenced.map((v, i) => (
<SilencedBox
key={i}
silenceEntry={v}
editSilence={editSilence(v)}
removeSilence={removeSilence(v)}
/>
))}
{(silenced ?? []).length === 0? (
<React.Fragment>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{flexFlow: "wrap"}}
>
{isLoading
? null
: silenced.map((v, i) => (
<SilencedBox
key={i}
silenceEntry={v}
editSilence={editSilence(v)}
removeSilence={removeSilence(v)}
/>
))}
<Typography variant="h4">No alerts silenced! </Typography> </Box>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{flexFlow: "wrap"}}
> <Typography variant="h5">Click the '+' to create a new one!
</Typography>
</Box>
{(silenced ?? []).length === 0 ? (
<React.Fragment>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{ flexFlow: "wrap" }}
>
<Typography variant="h4">No alerts silenced! </Typography>{" "}
</Box>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{ flexFlow: "wrap" }}
>
{" "}
<Typography variant="h5">
Click the '+' to create a new one!
</Typography>
</Box>
</React.Fragment>
): null}
) : null}
<Dialog
open={silenceEntry.deleteOpen}
onClose={handleDeleteClose()}

11
src/views/catalog/Catalog.jsx
View file

@ -3,13 +3,12 @@ import StoreContext from "../../ctx/StoreContext.jsx";
import JobContext from "../../ctx/JobContext.jsx";
import CatalogBox from "./CatalogBox.jsx";
import CatalogSearch from "./CatalogSearch.jsx";
import {useCatalogTests} from "../../Queries.jsx";
import { useCatalogTests } from "../../Queries.jsx";
import TextField from "@mui/material/TextField";
export default function Catalog() {
const { state: store, updateStore } = useContext(StoreContext);
const {isLoading, data: tests} = useCatalogTests();
const { isLoading, data: tests } = useCatalogTests();
const handleSearchChange = (e) =>
updateStore({ catalogSearch: e.target.value });
@ -29,9 +28,9 @@ export default function Catalog() {
clearOnUnmount
/>
<h6>{store.catalogSearch}</h6>
{isLoading ? null : tests.map((v, i) => (
<CatalogBox key={i} catalogTest={v} />
))}
{isLoading
? null
: tests.map((v, i) => <CatalogBox key={i} catalogTest={v} />)}
</div>
);
}

4
src/views/catalog/CatalogBox.jsx
View file

@ -29,7 +29,7 @@ export default function CatalogBox(props) {
const { state: store, updateStore } = useContext(StoreContext);
const { state: jobState, jobFactory} = useContext(JobContext);
const { state: jobState, jobFactory } = useContext(JobContext);
const [open, setOpen] = useState(false);
@ -38,7 +38,7 @@ export default function CatalogBox(props) {
const runTest = (e) => {
e.preventDefault();
e.stopPropagation();
const jobId = jobFactory({testNames: [testName]});
const jobId = jobFactory({ testNames: [testName] });
if (store.focusJob) navigate(`/qualiteer/jobs#${jobId}`);
};

64
src/views/failing/Failing.jsx
View file

@ -1,6 +1,6 @@
import { useState, useContext } from "react";
import { useNavigate } from "react-router-dom";
import {useCurrentlyFailing, useSilencedAlerts} from "../../Queries.jsx";
import { useCurrentlyFailing, useSilencedAlerts } from "../../Queries.jsx";
import StoreContext from "../../ctx/StoreContext.jsx";
import JobContext from "../../ctx/JobContext.jsx";
import SilenceDialog from "../alerting/SilenceDialog.jsx";
@ -28,8 +28,8 @@ export default function Failing() {
updateStore,
silenceRequest,
} = useContext(StoreContext);
const {isLoading, data: failing} = useCurrentlyFailing();
const {isSilencedLoading, data:silencedAlerts} = useSilencedAlerts();
const { isLoading, data: failing } = useCurrentlyFailing();
const { isSilencedLoading, data: silencedAlerts } = useSilencedAlerts();
const [silenceEntry, setSilenceEntry] = useState({ open: false });
const closeSilence = () => setSilenceEntry({ ...silenceEntry, open: false });
@ -58,22 +58,28 @@ export default function Failing() {
const failingTestsWithJobs = () => {
const silences = silencedAlerts ?? [];
for(var test of failing){
if(test.isCompound) continue;
const job = jobState.jobs.find((j)=>j.builderCache.testNames.includes(test.name))
if(job) test.job = job;
const silence = silences.find((s)=>s.name === test.name || s.class === test.class)
for (var test of failing) {
if (test.isCompound) continue;
const job = jobState.jobs.find((j) =>
j.builderCache.testNames.includes(test.name)
);
if (job) test.job = job;
const silence = silences.find(
(s) => s.name === test.name || s.class === test.class
);
if(silence) test.silencedUntil = silence;
if (silence) test.silencedUntil = silence;
}
return failing;
}
};
return (
<div className="failing">
{isLoading? null :failingTestsWithJobs().map((v, i) => (
<FailingBox key={i} failingTest={v} silenceClick={editSilence(v)} />
))}
{isLoading
? null
: failingTestsWithJobs().map((v, i) => (
<FailingBox key={i} failingTest={v} silenceClick={editSilence(v)} />
))}
<Dialog
open={retryAllOpen}
@ -100,25 +106,21 @@ export default function Failing() {
onClose={handleSilenceClose}
silence={silenceEntry}
/>
{(failing ?? []).length === 0? ( <Box
display="flex"
alignItems="center"
justifyContent="center"
>
<Typography variant="h4">No tests failing!</Typography>
</Box>
): null}
{(failing ?? []).length === 0 ? (
<Box display="flex" alignItems="center" justifyContent="center">
<Typography variant="h4">No tests failing!</Typography>
</Box>
) : null}
{(failing ?? []).length ===0? null :(
<SpeedDial
ariaLabel="Retry All"
sx={{ position: "fixed", bottom: 16, right: 16 }}
icon={<ReplayIcon />}
onClick={retryAllClick}
open={false}
/>)}
{(failing ?? []).length === 0 ? null : (
<SpeedDial
ariaLabel="Retry All"
sx={{ position: "fixed", bottom: 16, right: 16 }}
icon={<ReplayIcon />}
onClick={retryAllClick}
open={false}
/>
)}
</div>
);
}

8
src/views/failing/FailingBox.jsx
View file

@ -48,7 +48,7 @@ export default function FailingBox(props) {
failedMessage,
isCompound,
jobStatus: testJobStatus,
job
job,
} = failingTest;
const navigate = useNavigate();
@ -78,12 +78,12 @@ export default function FailingBox(props) {
}
const retryTest = () => {
const jobId = jobFactory({testNames: [testName], isTriage: true});
const jobId = jobFactory({ testNames: [testName], isTriage: true });
if (store.focusJob) navigate(`/qualiteer/jobs#${jobId}`);
};
const jobOnClick = () => {
if(!job) return retryTest;
if (!job) return retryTest;
switch (job.status) {
case jobStatus.OK:
return null;
@ -103,7 +103,7 @@ export default function FailingBox(props) {
};
function jobIcon() {
if(!job) return <ReplayIcon />;
if (!job) return <ReplayIcon />;
switch (job.status) {
case jobStatus.OK:
return <CheckIcon color="success" />;

42
src/views/jobs/JobView.jsx
View file

@ -21,13 +21,11 @@ import DoNotDisturbIcon from "@mui/icons-material/DoNotDisturb";
import DeleteIcon from "@mui/icons-material/Delete";
import PlayArrowIcon from "@mui/icons-material/PlayArrow";
export default function JobView(props) {
const navigate = useNavigate();
const { job } = props;
const { jobFactory, jobCancel, jobDestroy } = useContext(JobContext);
const {state: store} = useContext(StoreContext);
const { state: store } = useContext(StoreContext);
const [anchorEl, setAnchorEl] = React.useState(null);
const open = Boolean(anchorEl);
const handleClick = (event) => {
@ -51,8 +49,8 @@ export default function JobView(props) {
}
function retryJob() {
const jobId = jobFactory(job.builderCache);
if(store.focusJob) navigate(`/qualiteer/jobs#${jobId}`);
const jobId = jobFactory(job.builderCache);
if (store.focusJob) navigate(`/qualiteer/jobs#${jobId}`);
}
function downloadLog() {
@ -60,12 +58,11 @@ export default function JobView(props) {
download(`${job.jobId}.txt`, job.log.join("\n"));
}
function cancelJob(){
function cancelJob() {
jobCancel(job.jobId);
}
function deleteJob(){
function deleteJob() {
jobDestroy(job.jobId);
navigateToJobs();
}
@ -107,7 +104,7 @@ export default function JobView(props) {
<Toolbar disableGutters />
<JobLogView log={job.log} status={job.status} />
<Menu anchorEl={anchorEl} open={open} onClose={handleClose}>
<MenuItem onClick={menuSelect(downloadLog)}>
<MenuItem onClick={menuSelect(downloadLog)}>
<ListItemIcon>
<DownloadIcon fontSize="small" />
</ListItemIcon>
@ -115,16 +112,27 @@ export default function JobView(props) {
</MenuItem>
<MenuItem onClick={menuSelect(retryJob)}>
<ListItemIcon>
{job.status === jobStatus.OK || job.status === jobStatus.ERROR ? <ReplayIcon fontSize="small" /> : <PlayArrowIcon fontSize="small"/>}
{job.status === jobStatus.OK || job.status === jobStatus.ERROR ? (
<ReplayIcon fontSize="small" />
) : (
<PlayArrowIcon fontSize="small" />
)}
</ListItemIcon>
<ListItemText> {job.status === jobStatus.ERROR? "Retry" : "Duplicate"}</ListItemText>
<ListItemText>
{" "}
{job.status === jobStatus.ERROR ? "Retry" : "Duplicate"}
</ListItemText>
</MenuItem>
{job.status === jobStatus.OK || job.status === jobStatus.ERROR || job.status === jobStatus.CANCELED? null : <MenuItem onClick={menuSelect(cancelJob)}>
<ListItemIcon>
<DoNotDisturbIcon fontSize="small" />
</ListItemIcon>
<ListItemText>Cancel</ListItemText>
</MenuItem>}
{job.status === jobStatus.OK ||
job.status === jobStatus.ERROR ||
job.status === jobStatus.CANCELED ? null : (
<MenuItem onClick={menuSelect(cancelJob)}>
<ListItemIcon>
<DoNotDisturbIcon fontSize="small" />
</ListItemIcon>
<ListItemText>Cancel</ListItemText>
</MenuItem>
)}
<MenuItem onClick={menuSelect(deleteJob)}>
<ListItemIcon>
<DeleteIcon fontSize="small" />

61
src/views/jobs/Jobs.jsx
View file

@ -21,37 +21,42 @@ export default function Jobs() {
return (
<div className="jobs">
{jobState.jobs.length === 0? (
<React.Fragment>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{flexFlow: "wrap"}}
>
<Typography variant="h4">No jobs found! </Typography> </Box>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{flexFlow: "wrap"}}
> <Typography variant="h5">Click the '+' to start a new one!
</Typography>
</Box>
{jobState.jobs.length === 0 ? (
<React.Fragment>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{ flexFlow: "wrap" }}
>
<Typography variant="h4">No jobs found! </Typography>{" "}
</Box>
<Box
display="flex"
alignItems="center"
justifyContent="center"
sx={{ flexFlow: "wrap" }}
>
{" "}
<Typography variant="h5">
Click the '+' to start a new one!
</Typography>
</Box>
</React.Fragment>
): null}
) : null}
<JobBuilder />
{location.hash === "" &&
jobState.jobs.filter((j)=>!j.isPipeline).map((v, i) => (
<a
key={i}
href={`/qualiteer/jobs#${v.name}`}
style={{ textDecoration: "none" }}
>
<JobBox job={v} />
</a>
))}
jobState.jobs
.filter((j) => !j.isPipeline)
.map((v, i) => (
<a
key={i}
href={`/qualiteer/jobs#${v.name}`}
style={{ textDecoration: "none" }}
>
<JobBox job={v} />
</a>
))}
{jobState.jobs.find((job) => job.name === location.hash.slice(1)) && (
<JobView
job={jobState.jobs.find((job) => job.name === location.hash.slice(1))}

1
src/views/jobs/builder/PipelineConfirm.jsx
View file

@ -6,7 +6,6 @@ import DialogContent from "@mui/material/DialogContent";
function PipelineConfirm(props) {
const { cache, back, start } = props;
return (
<React.Fragment>
<DialogContent>

40
src/views/jobs/builder/PipelineSelector.jsx
View file

@ -1,5 +1,5 @@
import React, { useContext } from "react";
import {usePipelineMappings} from "../../../Queries.jsx";
import { usePipelineMappings } from "../../../Queries.jsx";
import Button from "@mui/material/Button";
import DialogActions from "@mui/material/DialogActions";
import DialogContent from "@mui/material/DialogContent";
@ -11,27 +11,27 @@ import Stack from "@mui/material/Stack";
function PipelineSelector(props) {
const { cache, setCache, cancel, next } = props;
const {isLoading, data: pipelineMappings} = usePipelineMappings();
const { isLoading, data: pipelineMappings } = usePipelineMappings();
const primaryMappings = () =>{
if(isLoading) return {};
const primaryMappings = () => {
if (isLoading) return {};
const primaryMappings = {};
for (var pm of pipelineMappings) {
if (!(pm[0] in primaryMappings)) primaryMappings[pm[0]] = [];
primaryMappings[pm[0]].push(pm);
}
return primaryMappings;
for (var pm of pipelineMappings) {
if (!(pm[0] in primaryMappings)) primaryMappings[pm[0]] = [];
primaryMappings[pm[0]].push(pm);
}
return primaryMappings;
};
const selectPrimary = (primarySelectedMappings) => () => {
setCache({ primarySelectedMappings });
};
const clickNext = () =>{
if(!cache.primarySelectedMappings ) return console.log("No mapping selected")
next()
}
const clickNext = () => {
if (!cache.primarySelectedMappings)
return console.log("No mapping selected");
next();
};
return (
<React.Fragment>
@ -53,11 +53,17 @@ function PipelineSelector(props) {
<Typography
component={"span"}
style={{ wordBreak: "break-word", margin: "auto 0" }}
color={(cache.primarySelectedMappings ?? [[]])[0][0] ===k ? "primary": null}
color={
(cache.primarySelectedMappings ?? [[]])[0][0] === k
? "primary"
: null
}
>
{k}
</Typography>
<Stack sx={{ ml: "auto" }}>{(primaryMappings[k] ?? []).length}</Stack>
<Stack sx={{ ml: "auto" }}>
{(primaryMappings[k] ?? []).length}
</Stack>
</AccordionSummary>
</Accordion>
))}

40
src/views/jobs/builder/PipelineTrackSelector.jsx
View file

@ -8,40 +8,48 @@ import AccordionSummary from "@mui/material/AccordionSummary";
import Box from "@mui/material/Box";
import Typography from "@mui/material/Typography";
import Stack from "@mui/material/Stack";
import {selectBranch, asTree, asBranches, as1d} from "../../../../lib/jobs/pipelines.js";
import {
selectBranch,
asTree,
asBranches,
as1d,
} from "../../../../lib/jobs/pipelines.js";
function PipelineTrackSelector(props) {
const { cache, setCache, back, next } = props;
const {primarySelectedMappings: primaries} = cache;
const { primarySelectedMappings: primaries } = cache;
const addTrack = (test) => {
const tracks = cache.tracks ?? []; tracks.push(selectBranch(primaries, test));
setCache({ ...cache, tracks});
const tracks = cache.tracks ?? [];
tracks.push(selectBranch(primaries, test));
setCache({ ...cache, tracks });
};
const removeTrack = (test) => {
const {tracks} = cache;
for(var i in tracks){
const { tracks } = cache;
for (var i in tracks) {
const index = tracks[i].indexOf(test);
if(index===-1) continue;
tracks[i] = tracks[i].slice(0,index);
if (index === -1) continue;
tracks[i] = tracks[i].slice(0, index);
}
setCache({ ...cache, tracks});
setCache({ ...cache, tracks });
};
const selectTrack = (test) => () => {
if(as1d(cache.tracks).includes(test)) return removeTrack(test);
if (as1d(cache.tracks).includes(test)) return removeTrack(test);
addTrack(test);
};
const getColor = (test) => as1d(cache.tracks).includes(test)
? "primary"
: null;
const getColor = (test) =>
as1d(cache.tracks).includes(test) ? "primary" : null;
const nextClick = () => {
setCache({...cache, branches: asBranches(primaries), tree: asTree(cache.tracks)});
setCache({
...cache,
branches: asBranches(primaries),
tree: asTree(cache.tracks),
});
next();
}
};
return (
<React.Fragment>

60
tests/assets/suite/runner.js
View file

@ -1,7 +1,12 @@
import axios from "axios";
import primary from "./primary.js";
import secondary from "./secondary.js";
import tertiary from "./tertiary.js";
import secondary1 from "./secondary1.js";
import secondary2 from "./secondary2.js";
import tertiary1 from "./tertiary1.js";
import tertiary2 from "./tertiary2.js";
import tertiary3 from "./tertiary3.js";
import single from "./single.js";
import failing from "./failing.js";
@ -12,31 +17,33 @@ const reportingUrl = `${process.env.QUALITEER_URL}/api/dev/rabbit/TestResults`;
// Pull args
const args = process.argv.slice(2);
const test = (args.find((v) => v.includes("test=")) ?? "").replace("test=", "");
const pipelineData = (
args.find((v) => v.includes("pipelineData=")) ?? ""
).replace("pipelineData=", "");
const pipelineTriggers = (
args.find((v) => v.includes("pipelineTriggers=")) ?? ""
).replace("pipelineTriggers=", "");
const pipelineDashboardSocket =
(args.find((v) => v.includes("pipelineDashboardSocket=")) ?? "").replace(
"pipelineDashboardSocket=",
""
) || undefined;
var pipeline = (args.find((v) => v.includes("pipeline=")) ?? "").replace(
"pipeline=",
""
);
if (pipeline)
pipeline = JSON.parse(Buffer.from(pipeline, "base64").toString("utf8"));
const logNow = () => console.log(Date.now());
const liveIndicator = () => {
for (var i = 0; i < endLiveCount; i++) setTimeout(logNow, i * liveUpdateDelay);
for (var i = 0; i < endLiveCount; i++)
setTimeout(logNow, i * liveUpdateDelay);
};
const runTests = () => {
switch (test) {
case "primary":
return primary();
case "secondary":
return secondary(pipelineData);
case "tertiary":
return tertiary(pipelineData);
case "secondary1":
return secondary1(pipeline.testData);
case "secondary2":
return secondary2(pipeline.testData);
case "tertiary1":
return tertiary1(pipeline.testData);
case "tertiary2":
return tertiary2(pipeline.testData);
case "tertiary3":
return tertiary3(pipeline.testData);
case "single":
return single();
case "failing":
@ -50,15 +57,18 @@ const runTests = () => {
liveIndicator();
setTimeout(() => {
const status = runTests();
pipeline.testData = status.pipelineData;
const testResult = {
...status,
name: test,
pipelineTriggers: pipelineTriggers ? pipelineTriggers : undefined,
pipelineDashboardSocket,
pipeline,
};
axios.post(reportingUrl, { testResult }).catch((e) => {
console.log(e.response.status);
}).then(()=>{
if(status.status === 1) process.exit(1);
});
axios
.post(reportingUrl, { testResult })
.catch((e) => {
console.log(e.response.status);
})
.then(() => {
if (status.status === 1) process.exit(1);
});
}, endLiveCount * liveUpdateDelay);

4
tests/assets/suite/secondary.js
View file

@ -1,4 +0,0 @@
export default function secondaryTest(pipelineData) {
console.log("This came from a secondary test!");
return { status: +(pipelineData !== "SomeData"), pipelineData: "SomeOtherData" };
}

7
tests/assets/suite/secondary1.js Normal file
View file

@ -0,0 +1,7 @@
export default function secondaryTest(pipelineData) {
console.log("This came from a secondary1 test!");
return {
status: +(pipelineData !== "SomeData"),
pipelineData: "SomeOtherData",
};
}

7
tests/assets/suite/secondary2.js Normal file
View file

@ -0,0 +1,7 @@
export default function secondaryTest(pipelineData) {
console.log("This came from a secondary2 test!");
return {
status: +(pipelineData !== "SomeData"),
pipelineData: "SomeOtherOtherData",
};
}

2
tests/assets/suite/tertiary.js → tests/assets/suite/tertiary1.js
View file

@ -1,4 +1,4 @@
export default function secondaryTest(pipelineData) {
console.log("This came from a tertiary!");
console.log("This came from a tertiary1!");
return { status: +(pipelineData !== "SomeOtherData") };
}

4
tests/assets/suite/tertiary2.js Normal file
View file

@ -0,0 +1,4 @@
export default function secondaryTest(pipelineData) {
console.log("This came from a tertiary2!");
return { status: +(pipelineData !== "SomeOtherData") };
}

4
tests/assets/suite/tertiary3.js Normal file
View file

@ -0,0 +1,4 @@
export default function secondaryTest(pipelineData) {
console.log("This came from a tertiary3!");
return { status: +(pipelineData !== "SomeOtherData") };
}

11
tests/index.js
View file

@ -14,7 +14,16 @@ const primary = new Initiator(url);
const job = {
type: "compound",
testName: "primary",
pipelineTriggers: "secondary",
pipeline: {
triggers: {
secondary1: {
tertiary1: {},
tertiary2: { __testDelay: 5000 },
__testDelay: 1000,
},
secondary2: { tertiary3: { __testDelay: 3000 }, __testDelay: 15000 },
},
},
name: "testing",
image: "node",
};