From 782c742d08591a83dd2c61b7d0eda1afcedc5b1d Mon Sep 17 00:00:00 2001 From: Jakub Kabza Date: Wed, 12 Dec 2018 07:42:29 +0100 Subject: [PATCH] Remove original kyma-installation dir (#1962) --- .dockerignore | 1 - kyma-installer/Jenkinsfile | 58 ---------------------------- kyma-installer/artifacts.Jenkinsfile | 36 ----------------- kyma-installer/kyma.Dockerfile | 7 ---- 4 files changed, 102 deletions(-) delete mode 100644 kyma-installer/Jenkinsfile delete mode 100644 kyma-installer/artifacts.Jenkinsfile delete mode 100644 kyma-installer/kyma.Dockerfile diff --git a/.dockerignore b/.dockerignore index 9f2258d34613..367b5dc2d023 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ * !resources !installation -!kyma-installer !tools/kyma-installer \ No newline at end of file diff --git a/kyma-installer/Jenkinsfile b/kyma-installer/Jenkinsfile deleted file mode 100644 index c617f37a0ea4..000000000000 --- a/kyma-installer/Jenkinsfile +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env groovy -def label = "kyma-${UUID.randomUUID().toString()}" -def application = 'kyma-installer' -def dockerPushRoot = "${env.DOCKER_REGISTRY}${params.PUSH_DIR}" -def dockerImageTag = params.APP_VERSION -def installerImageTag = null - -echo """ -******************************** -Job started with the following parameters: -DOCKER_REGISTRY=${env.DOCKER_REGISTRY} -PUSH_DIR=${params.PUSH_DIR} -DOCKER_CREDENTIALS=${env.DOCKER_CREDENTIALS} -GIT_BRANCH=${params.GIT_BRANCH} -APP_VERSION=${params.APP_VERSION} -******************************** -""" - -podTemplate(label: label) { - node(label) { - try { - timestamps { - timeout(time:20, unit:"MINUTES") { - ansiColor('xterm') { - stage("setup") { - checkout scm - - if(dockerImageTag == ""){ - error("No version for docker tag defined, please set APP_VERSION parameter for master branch or GIT_BRANCH parameter for any branch") - } - - withCredentials([usernamePassword(credentialsId: env.DOCKER_CREDENTIALS, passwordVariable: 'pwd', usernameVariable: 'uname')]) { - sh "docker login -u $uname -p '$pwd' $env.DOCKER_REGISTRY" - } - } - - stage("build image $application") { - sh "docker build -t ${dockerPushRoot}${application}:latest -f ${application}/kyma.Dockerfile . --label version=${dockerImageTag} --label component=${application}" - } - - stage("push image") { - sh "docker tag ${dockerPushRoot}${application}:latest ${dockerPushRoot}${application}:${dockerImageTag}" - sh "docker push ${dockerPushRoot}${application}:${dockerImageTag}" - if (params.GIT_BRANCH == 'master') { - sh "docker push ${dockerPushRoot}${application}:latest" - } - } - } - } - } - } catch (ex) { - echo "Got exception: ${ex}" - currentBuild.result = "FAILURE" - def body = "${currentBuild.currentResult} ${env.JOB_NAME}${env.BUILD_DISPLAY_NAME}: on branch: ${params.GIT_BRANCH}. See details: ${env.BUILD_URL}" - emailext body: body, recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'CulpritsRecipientProvider'], [$class: 'RequesterRecipientProvider']], subject: "${currentBuild.currentResult}: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'" - } - } -} diff --git a/kyma-installer/artifacts.Jenkinsfile b/kyma-installer/artifacts.Jenkinsfile deleted file mode 100644 index 801a0b7fc45f..000000000000 --- a/kyma-installer/artifacts.Jenkinsfile +++ /dev/null @@ -1,36 +0,0 @@ -def label = "kyma-${UUID.randomUUID().toString()}" -def registry = 'eu.gcr.io/kyma-project' -def acsImageName = 'acs-installer:0.0.4' - -echo """******************************** -Job started with the following parameters: -GIT_BRANCH=${params.GIT_BRANCH} -KYMA_INSTALLER_PUSH_DIR=${params.KYMA_INSTALLER_PUSH_DIR} -KYMA_INSTALLER_VERSION=${params.KYMA_INSTALLER_VERSION} -******************************** -""" - -podTemplate(label: label) { - node(label) { - timestamps { - timeout(time:20, unit:"MINUTES") { - - currentBuild.displayName = "#${BUILD_NUMBER}, ${params.KYMA_INSTALLER_VERSION}" - - stage("Checkout") { - checkout scm - } - - stage("Generate artifacts") { - def dockerEnv = "-e KYMA_INSTALLER_PUSH_DIR -e KYMA_INSTALLER_VERSION -e ARTIFACTS_DIR=/kyma" - def dockerOpts = "--rm --volume ${WORKSPACE}:/kyma" - def dockerEntry = "--entrypoint /kyma/installation/scripts/release-generate-kyma-installer-artifacts.sh" - - sh "docker run $dockerOpts $dockerEnv $dockerEntry $registry/$acsImageName" - } - - archiveArtifacts artifacts: "kyma-config-cluster.yaml, kyma-config-local.yaml" - } - } - } -} \ No newline at end of file diff --git a/kyma-installer/kyma.Dockerfile b/kyma-installer/kyma.Dockerfile deleted file mode 100644 index faeb6aaab1cf..000000000000 --- a/kyma-installer/kyma.Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -ARG INSTALLER_VERSION=cb19df90 -FROM eu.gcr.io/kyma-project/develop/installer:$INSTALLER_VERSION - -LABEL source="git@github.com:kyma-project/kyma.git" - -COPY /installation /kyma/injected/installation -COPY /resources /kyma/injected/resources