DBZ-5165 cleanup of forsaken changes
This commit is contained in:
parent
8eeab0802c
commit
a0b414e2a8
@ -464,7 +464,6 @@
|
||||
<test.ocp.project.debezium>${ocp.project.debezium}</test.ocp.project.debezium>
|
||||
<test.ocp.project.registry>${ocp.project.registry}</test.ocp.project.registry>
|
||||
<test.ocp.project.mysql>${ocp.project.mysql}</test.ocp.project.mysql>
|
||||
<test.ocp.project.oracle>${ocp.project.oracle}</test.ocp.project.oracle>
|
||||
<test.ocp.project.postgresql>${ocp.project.postgresql}</test.ocp.project.postgresql>
|
||||
<test.ocp.project.mongo>${ocp.project.mongo}</test.ocp.project.mongo>
|
||||
<test.ocp.project.sqlserver>${ocp.project.sqlserver}</test.ocp.project.sqlserver>
|
||||
|
@ -14,7 +14,6 @@
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
|
||||
import io.fabric8.kubernetes.api.model.SecretBuilder;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
@ -147,10 +146,10 @@ public Secret deployPullSecret(String yamlPath) {
|
||||
return pullSecret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets pull secret
|
||||
* @return pull secret associated with this operator
|
||||
*/
|
||||
/**
|
||||
* Gets pull secret
|
||||
* @return pull secret associated with this operator
|
||||
*/
|
||||
public Optional<Secret> getPullSecret() {
|
||||
return Optional.ofNullable(pullSecret);
|
||||
}
|
||||
|
@ -138,14 +138,6 @@ public B withPullSecrets(String yamlPath) {
|
||||
return self();
|
||||
}
|
||||
|
||||
public B withExistingPullSecrets(OpenShiftClient ocp, String secretName) {
|
||||
this.pullSecret = ocp.secrets()
|
||||
.inNamespace(project)
|
||||
.withName(secretName)
|
||||
.get();
|
||||
return self();
|
||||
}
|
||||
|
||||
private boolean isLbService(String yamlPath) {
|
||||
return yamlPath.contains("-lb.");
|
||||
}
|
||||
|
@ -11,15 +11,14 @@ pipelineJob('ocp-system-test') {
|
||||
|
||||
stringParam('PULL_SECRET', 'rh-integration-quay-secret', 'Quay.io OpenShift secret')
|
||||
|
||||
// TODO change default tag when job is done
|
||||
stringParam('DOCKER_TAG', 'docker-test', 'Docker image tag')
|
||||
stringParam('DOCKER_TAG', 'latest', 'Docker image tag')
|
||||
stringParam('OCP_PROJECT_NAME', 'debezium-test', 'OCP projects name')
|
||||
stringParam('OCP_CREDENTIALS', 'openshift-dbz-creds', 'Jenkins credentials id')
|
||||
stringParam('OCP_URL', '', 'Ocp url')
|
||||
|
||||
booleanParam('TEST_APICURIO_REGISTRY', false, 'Run tests with Apicurio Registry and Avro serialization')
|
||||
|
||||
booleanParam('STRIMZI_KC_BUILD', false, 'Use connect image instead of artifact server')
|
||||
booleanParam('STRIMZI_KC_BUILD', false, 'True -> use artifact server, false -> dbz connect image')
|
||||
stringParam('DBZ_CONNECT_IMAGE', 'quay.io/rh_integration/test-strimzi-kafka:strz-latest-kafka-3.1.0-apc-2.2.3.Final-dbz-2.0.0-SNAPSHOT', 'Debezium connect image')
|
||||
stringParam('ARTIFACT_SERVER_IMAGE', 'quay.io/rh_integration/test-artifact-server:2.0.0-SNAPSHOT', 'Artifact server image')
|
||||
stringParam('APICURIO_VERSION', '2.2.3.Final', 'Apicurio version')
|
||||
|
@ -1,6 +1,6 @@
|
||||
pipeline {
|
||||
agent {
|
||||
label 'NodeXL'
|
||||
label 'Slave'
|
||||
}
|
||||
|
||||
stages {
|
||||
@ -38,7 +38,7 @@ pipeline {
|
||||
expression { params.APICURIO_PREPARE_BUILD_NUMBER }
|
||||
}
|
||||
steps {
|
||||
copyArtifacts projectName: 'ocp-downstream-apicurio-prepare-job', target: 'debezium/jenkins-jobs/docker/debezium-testing-system/downstream' , filter: 'apicurio-registry-install-examples.zip', selector: params.APICURIO_PREPARE_BUILD_NUMBER
|
||||
copyArtifacts projectName: 'ocp-downstream-apicurio-prepare-job', target: 'debezium/jenkins-jobs/docker/debezium-testing-system/downstream' , filter: 'apicurio-registry-install-examples.zip', selector: specific(params.APICURIO_PREPARE_BUILD_NUMBER)
|
||||
}
|
||||
}
|
||||
|
||||
@ -55,7 +55,7 @@ pipeline {
|
||||
expression { params.STRIMZI_PREPARE_BUILD_NUMBER }
|
||||
}
|
||||
steps {
|
||||
copyArtifacts projectName: 'ocp-downstream-strimzi-prepare-job', target: 'debezium/jenkins-jobs/docker/debezium-testing-system/downstream' , filter: 'amq-streams-install-examples.zip', selector: params.STRIMZI_PREPARE_BUILD_NUMBER
|
||||
copyArtifacts projectName: 'ocp-downstream-strimzi-prepare-job', target: 'debezium/jenkins-jobs/docker/debezium-testing-system/downstream' , filter: 'amq-streams-install-examples.zip', selector: specific(params.STRIMZI_PREPARE_BUILD_NUMBER)
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user