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:
resources:
- name: git-source
type: git
params: params:
- name: pathToContext and space - name: pathToDockerFile
description: The path to the build context, used by Kaniko - within the workspace type: string
default: description: The path to the dockerfile to build
- name: pathToYamlFile default: /workspace/workspace/Dockerfile
description: The path to the yaml file to deploy within the git source resources:
- name: imageUrl inputs:
description: Url of image repository - name: workspace
- name: type: git
description: Tag to apply to the built image outputs:
tasks: - name: builtImage
- name: source-to-image type: image
taskRef: steps:
name: source-to-image - name: ubuntu-example
params: image: ubuntu
- name: pathToContext args: ["ubuntu-build-example", "SECRETS-example.md"]
value: "$(params.pathToContext)" - image: gcr.io/example-builders/build-example
- name: imageUrl command: ["echo"]
value: "$(params.imageUrl)" args: ["$(params.pathToDockerFile)"]
- name: imageTag - name: dockerfile-pushexample
value: "$(params.imageTag)" image: gcr.io/example-builders/push-example
resources: args: ["push", "$(resources.outputs.builtImage.url)"]
inputs: volumeMounts:
- name: git-source - name: example-volume
resource: git-source mountPath: /var/run/docker.sock
- name: deploy-to-cluster volumes:
taskRef: - name: sample-example-volume
name: deploy-using-kubectl emptyDir: {}
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:
resources:
- name: git-source
type: git
params: params:
- name: pathToContext - name: pathToDockerFile
description: The path to the build context, used by Kaniko - within the workspace type: string
default: src description: The path to the dockerfile to build
- name: pathToYamlFile default: /workspace/workspace/Dockerfile
description: The path to the yaml file to deploy within the git source resources:
- name: imageUrl inputs:
description: Url of image repository - name: workspace
- name: imageTag type: git
description: Tag to apply to the built image outputs:
tasks: - name: builtImage
- name: source-to-image type: image
taskRef: steps:
name: source-to-image - name: ubuntu-example
params: image: ubuntu
- name: pathToContext args: ["ubuntu-build-example", "SECRETS-example.md"]
value: "$(params.pathToContext)" - image: gcr.io/example-builders/build-example
- name: imageUrl command: ["echo"]
value: "$(params.imageUrl)" args: ["$(params.pathToDockerFile)"]
- name: imageTag - name: dockerfile-pushexample
value: "$(params.imageTag)" image: gcr.io/example-builders/push-example
resources: args: ["push", "$(resources.outputs.builtImage.url)"]
inputs: volumeMounts:
- name: git-source - name: example-volume
resource: git-source mountPath: /var/run/docker.sock
- name: deploy-to-cluster volumes:
taskRef: - name: example-volume
name: deploy-using-kubectl emptyDir: {}
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 \