fix tests

This commit is contained in:
Lucas Gravley 2020-10-13 12:05:56 -05:00
parent d8b13b0fd8
commit 8ccb75ef15
3 changed files with 62 additions and 94 deletions

View file

@ -1,49 +1,33 @@
apiVersion: tekton.dev/v1alpha1 apiVersion: tekton.dev/v1beta1
kind: Pipeline kind: Task
metadata: metadata:
name: build-and-deploy-pipeline name: example-task-name
spec: spec:
params:
- name: pathToDockerFile
type: string
description: The path to the dockerfile to build
default: /workspace/workspace/Dockerfile
resources: resources:
- name: git-source inputs:
- name: workspace
type: git type: git
params: outputs:
- name: pathToContext and space - name: builtImage
description: The path to the build context, used by Kaniko - within the workspace type: image
default: steps:
- name: pathToYamlFile - name: ubuntu-example
description: The path to the yaml file to deploy within the git source image: ubuntu
- name: imageUrl args: ["ubuntu-build-example", "SECRETS-example.md"]
description: Url of image repository - image: gcr.io/example-builders/build-example
- name: command: ["echo"]
description: Tag to apply to the built image args: ["$(params.pathToDockerFile)"]
tasks: - name: dockerfile-pushexample
- name: source-to-image image: gcr.io/example-builders/push-example
taskRef: args: ["push", "$(resources.outputs.builtImage.url)"]
name: source-to-image volumeMounts:
params: - name: example-volume
- name: pathToContext mountPath: /var/run/docker.sock
value: "$(params.pathToContext)" volumes:
- name: imageUrl - name: sample-example-volume
value: "$(params.imageUrl)" emptyDir: {}
- name: imageTag
value: "$(params.imageTag)"
resources:
inputs:
- name: git-source
resource: git-source
- name: deploy-to-cluster
taskRef:
name: deploy-using-kubectl
runAfter:
- source-to-image
params:
- name: pathToYamlFile
value: "$(params.pathToYamlFile)"
- name: imageUrl
value: "$(params.imageUrl)"
- name: imageTag
value: "$(params.imageTag)"
resources:
inputs:
- name: git-source
resource: git-source

View file

@ -1,49 +1,33 @@
apiVersion: tekton.dev/v1alpha1 apiVersion: tekton.dev/v1beta1
kind: Pipeline kind: Task
metadata: metadata:
name: build-and-deploy-pipeline name: example-task-name
spec: spec:
params:
- name: pathToDockerFile
type: string
description: The path to the dockerfile to build
default: /workspace/workspace/Dockerfile
resources: resources:
- name: git-source inputs:
- name: workspace
type: git type: git
params: outputs:
- name: pathToContext - name: builtImage
description: The path to the build context, used by Kaniko - within the workspace type: image
default: src steps:
- name: pathToYamlFile - name: ubuntu-example
description: The path to the yaml file to deploy within the git source image: ubuntu
- name: imageUrl args: ["ubuntu-build-example", "SECRETS-example.md"]
description: Url of image repository - image: gcr.io/example-builders/build-example
- name: imageTag command: ["echo"]
description: Tag to apply to the built image args: ["$(params.pathToDockerFile)"]
tasks: - name: dockerfile-pushexample
- name: source-to-image image: gcr.io/example-builders/push-example
taskRef: args: ["push", "$(resources.outputs.builtImage.url)"]
name: source-to-image volumeMounts:
params: - name: example-volume
- name: pathToContext mountPath: /var/run/docker.sock
value: "$(params.pathToContext)" volumes:
- name: imageUrl - name: example-volume
value: "$(params.imageUrl)" emptyDir: {}
- name: imageTag
value: "$(params.imageTag)"
resources:
inputs:
- name: git-source
resource: git-source
- name: deploy-to-cluster
taskRef:
name: deploy-using-kubectl
runAfter:
- source-to-image
params:
- name: pathToYamlFile
value: "$(params.pathToYamlFile)"
- name: imageUrl
value: "$(params.imageUrl)"
- name: imageTag
value: "$(params.imageTag)"
resources:
inputs:
- name: git-source
resource: git-source

View file

@ -155,8 +155,8 @@ RUN curl --retry 5 --retry-delay 5 -sL https://cpanmin.us/ | perl - -nq --no-wge
############################## ##############################
RUN wget --tries=5 -O phive.phar https://phar.io/releases/phive.phar \ RUN wget --tries=5 -O phive.phar https://phar.io/releases/phive.phar \
&& wget --tries=5 -O phive.phar.asc https://phar.io/releases/phive.phar.asc \ && wget --tries=5 -O phive.phar.asc https://phar.io/releases/phive.phar.asc \
&& gpg --keyserver pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79 \ #&& gpg --keyserver pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79 \
&& gpg --verify phive.phar.asc phive.phar \ #&& gpg --verify phive.phar.asc phive.phar \
&& chmod +x phive.phar \ && chmod +x phive.phar \
&& mv phive.phar /usr/local/bin/phive \ && mv phive.phar /usr/local/bin/phive \
&& rm phive.phar.asc \ && rm phive.phar.asc \